Merge pull request #403 from Metaswitch/md/fixmacos

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

.github/dependabot.yml

@@ -19,6 +19,8 @@ updates:
       - dependency-name: serde_derive
         versions:
           - 1.0.123
+    assignees:
+      - maxdymond
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -30,3 +32,5 @@ updates:
         patterns:
           - actions/download-artifact
           - actions/upload-artifact
+    assignees:
+      - maxdymond

.github/workflows/ci.yml

@@ -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 }}
@@ -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:
@@ -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
@@ -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
@@ -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"

build.sh

@@ -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}
 

changelog.sh

@@ -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