ci: syntax toolchain error in gha

GetFirefly · Feb 25, 2023 · 29f2e2b · 29f2e2b
1 parent 079ba10
commit 29f2e2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/.github/workflows/x86_64-apple-darwin-compiler.yml b/.github/workflows/x86_64-apple-darwin-compiler.yml
@@ -7,7 +7,7 @@ env:
   FIREFLY_BUILD_TYPE: static
   LLVM_LINK_LLVM_DYLIB: OFF
   LLVM_VERSION: 15.0.7
-  TOOLCHAIN: nightly-2022-11-02
+  CARGO_MAKE_TOOLCHAIN: nightly-2022-11-02
 
 jobs:
   compiler:
@@ -18,15 +18,15 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
           override: true
       - name: Cache Cargo
         uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.CARGO_MAKE_TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install cargo-make
         uses: actions-rs/cargo@v1
         with:
@@ -67,17 +67,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args:
-          - "-p"
-          - "firefly_intern"
-          - "-p"
-          - "firefly_parser"
-          - "-p"
-          - "firefly_target"
-          - "-p"
-          - "firefly_syntax_erl"
-          - "-p"
-          - "firefly_syntax_pp"
+          args: "-p firefly_intern -p firefly_parser -p firefly_target -p firefly_syntax_erl -p firefly_syntax_pp"
       - name: Run literate tests
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml b/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml
@@ -9,7 +9,7 @@ env:
   FIREFLY_BUILD_TYPE: static
   LLVM_LINK_LLVM_DYLIB: OFF
   LLVM_VERSION: 15.0.7
-  TOOLCHAIN: nightly-2022-11-02
+  CARGO_MAKE_TOOLCHAIN: nightly-2022-11-02
 
 jobs:
   compiler:
@@ -44,19 +44,19 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
           override: true
       - name: Cache Cargo
         uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ github.workflow }}-${{ github.job }}-toolchain-${{ env.CARGO_MAKE_TOOLCHAIN }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install cargo-make
         uses: actions-rs/cargo@v1
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
+          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
           command: install
           args: cargo-make
       - name: Build Compiler
@@ -71,17 +71,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args:
-          - "-p"
-          - "firefly_intern"
-          - "-p"
-          - "firefly_parser"
-          - "-p"
-          - "firefly_target"
-          - "-p"
-          - "firefly_syntax_erl"
-          - "-p"
-          - "firefly_syntax_pp"
+          args: "-p firefly_intern -p firefly_parser -p firefly_target -p firefly_syntax_erl -p firefly_syntax_pp"
       - name: Run literate tests
         uses: actions-rs/cargo@v1
         with:

diff --git a/Makefile.toml b/Makefile.toml
@@ -72,7 +72,7 @@ CARGO_MAKE_RUST_SCRIPT_PROVIDER = "rust-script"
 CARGO_MAKE_USE_WORKSPACE_PROFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = "--no-fail-fast"
 CARGO_TARGET_DIR = { value = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-CARGO_MAKE_TOOLCHAIN_DEFAULT = { source = "${CARGO_MAKE_CI}", default_value = "nightly", mapping = { "true" = "nightly-2022-08-08", "false" = "nightly" } }
+CARGO_MAKE_TOOLCHAIN_DEFAULT = { source = "${CARGO_MAKE_CI}", default_value = "nightly", mapping = { "true" = "nightly-2022-11-02", "false" = "nightly" } }
 CARGO_MAKE_TOOLCHAIN = { value = "${CARGO_MAKE_TOOLCHAIN_DEFAULT}", condition = { env_not_set = ["CARGO_MAKE_TOOLCHAIN"] } }
 BACKTRACE_DEFAULT = { source = "${CARGO_MAKE_CI}", mapping = { "true" = "1", "false" = "0" } }
 RUST_BACKTRACE = { value = "${BACKTRACE_DEFAULT}", condition = { env_not_set = ["RUST_BACKTRACE"] } }