Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch out tomlq for cargo-get to fix the MacOS build. #403

Merged
merged 1 commit into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ updates:
- dependency-name: serde_derive
versions:
- 1.0.123
assignees:
- maxdymond
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand All @@ -30,3 +32,5 @@ updates:
patterns:
- actions/download-artifact
- actions/upload-artifact
assignees:
- maxdymond
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- name: Install cargo-get
run: cargo install cargo-get
- name: Run tests
run: cargo test --all-features
- run: pip3 install -U tomlq
- run: "./build.sh"
env:
OS_NAME: ${{ matrix.os }}
Expand All @@ -78,6 +79,8 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- name: Install cargo-get
run: cargo install cargo-get
- name: Publish to crates.io
run: cargo publish
env:
Expand All @@ -91,7 +94,6 @@ jobs:
uses: actions/download-artifact@v4
with:
name: stableartifacts-macos-latest
- run: pip3 install -U tomlq
- name: Generate release.txt
run: "./changelog.sh"
- name: Release
Expand Down Expand Up @@ -119,6 +121,8 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
- name: Install cargo-get
run: cargo install cargo-get
- name: Dry-run publish on non-tags
run: cargo publish --dry-run
# Test downloading the artifacts
Expand All @@ -130,3 +134,6 @@ jobs:
uses: actions/download-artifact@v4
with:
name: stableartifacts-macos-latest
# Test generating release.txt
- name: Generate release.txt
run: "./changelog.sh"
108 changes: 0 additions & 108 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ then
OS_ID="osx"
fi

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

LABEL=${TAG}-${OS_ID}

Expand Down
2 changes: 1 addition & 1 deletion changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

set -euxo pipefail

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

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