Skip to content

Commit 1ebdb46

Browse files
author
Max Dymond
committed
Switch out tomlq for cargo-get to fix the MacOS build.
Signed-off-by: Max Dymond <max.dymond@microsoft.com>
1 parent f3519a5 commit 1ebdb46

5 files changed

Lines changed: 15 additions & 112 deletions

File tree

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ updates:
1919
- dependency-name: serde_derive
2020
versions:
2121
- 1.0.123
22+
assignees:
23+
- maxdymond
2224
- package-ecosystem: "github-actions"
2325
directory: "/"
2426
schedule:
@@ -30,3 +32,5 @@ updates:
3032
patterns:
3133
- actions/download-artifact
3234
- actions/upload-artifact
35+
assignees:
36+
- maxdymond

.github/workflows/ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ jobs:
5151
uses: dtolnay/rust-toolchain@master
5252
with:
5353
toolchain: ${{ matrix.rust }}
54+
- name: Install cargo-get
55+
run: cargo install cargo-get
5456
- name: Run tests
5557
run: cargo test --all-features
56-
- run: pip3 install -U tomlq
5758
- run: "./build.sh"
5859
env:
5960
OS_NAME: ${{ matrix.os }}
@@ -78,6 +79,8 @@ jobs:
7879
uses: dtolnay/rust-toolchain@master
7980
with:
8081
toolchain: stable
82+
- name: Install cargo-get
83+
run: cargo install cargo-get
8184
- name: Publish to crates.io
8285
run: cargo publish
8386
env:
@@ -91,7 +94,6 @@ jobs:
9194
uses: actions/download-artifact@v4
9295
with:
9396
name: stableartifacts-macos-latest
94-
- run: pip3 install -U tomlq
9597
- name: Generate release.txt
9698
run: "./changelog.sh"
9799
- name: Release
@@ -119,6 +121,8 @@ jobs:
119121
uses: dtolnay/rust-toolchain@master
120122
with:
121123
toolchain: stable
124+
- name: Install cargo-get
125+
run: cargo install cargo-get
122126
- name: Dry-run publish on non-tags
123127
run: cargo publish --dry-run
124128
# Test downloading the artifacts
@@ -130,3 +134,6 @@ jobs:
130134
uses: actions/download-artifact@v4
131135
with:
132136
name: stableartifacts-macos-latest
137+
# Test generating release.txt
138+
- name: Generate release.txt
139+
run: "./changelog.sh"

.travis.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ then
1010
OS_ID="osx"
1111
fi
1212

13-
TAG=$(tomlq -r '.package.version' Cargo.toml)
13+
TAG=$(cargo get package.version)
1414

1515
LABEL=${TAG}-${OS_ID}
1616

changelog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -euxo pipefail
44

5-
VERSION=$(tomlq -r '.package.version' Cargo.toml)
5+
VERSION=$(cargo get package.version)
66

77
docker run -v $PWD:$PWD -w $PWD sean0x42/markdown-extract -r "${VERSION}" CHANGELOG.md | tee release.txt

0 commit comments

Comments
 (0)