Merge pull request #63 from moia-oss/change-toml

change toolchain files to toml

.github/workflows/pr.yaml

@@ -7,7 +7,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - run: echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: just
+      - run: echo "RUST_TOOLCHAIN=$(just rust-version)" >> $GITHUB_ENV
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
@@ -21,9 +24,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: just
       - run: |
-          echo "RUST_TOOLCHAIN=$(cat ./rust-toolchain)" >> $GITHUB_ENV
-          echo "RUST_TOOLCHAIN_NIGHTLY=$(cat ./rust-toolchain-nightly)" >> $GITHUB_ENV
+          echo "RUST_TOOLCHAIN=$(just rust-version)" >> $GITHUB_ENV
+          echo "RUST_TOOLCHAIN_NIGHTLY=$(just rust-nightly-version)" >> $GITHUB_ENV
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_NIGHTLY }}

Makefile

@@ -1,4 +1,4 @@
-RUST_NIGHTLY_VERSION  := $(shell cat rust-toolchain-nightly)
+RUST_NIGHTLY_VERSION  := $(shell sed -nr 's/channel = "(.*)"/\1/p' rust-toolchain-nightly.toml)
 GRCOV_VERSION         := 0.8.19
 
 install-nightly:

justfile

@@ -0,0 +1,14 @@
+# Fail on early and on unset variables in non-shebang recipes
+set shell := ["bash", "-euo", "pipefail", "-c"]
+# Allow usage of bash methods to handle multiple arguments and work around quoting issues
+set positional-arguments
+set quiet
+
+rust_version         := `sed -nr 's/channel = "(.*)"/\1/p' rust-toolchain.toml`
+rust_nightly_version := `sed -nr 's/channel = "(.*)"/\1/p' rust-toolchain-nightly.toml`
+
+rust-version:
+    echo '{{rust_version}}'
+
+rust-nightly-version:
+    echo '{{rust_nightly_version}}'

rust-toolchain-nightly.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2024-03-21"

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.77.0"