diff --git a/.github/workflows/macos_x86_64.yml b/.github/workflows/macos_x86_64.yml index 131515dc228..efe92ac8c13 100644 --- a/.github/workflows/macos_x86_64.yml +++ b/.github/workflows/macos_x86_64.yml @@ -9,6 +9,7 @@ concurrency: env: RUST_BACKTRACE: 1 + LLVM_SYS_160_PREFIX: $(brew --prefix llvm) jobs: test-rust-macos-x86-64: @@ -16,13 +17,14 @@ jobs: timeout-minutes: 90 env: RUSTC_WRAPPER: /Users/username1/.cargo/bin/sccache - ROC_ZIG: /Users/username1/Downloads/zig-macos-x86_64-0.11.0/zig steps: - uses: actions/checkout@v3 - - run: | - zig version - $ROC_ZIG version + - name: Update PATH to use zig 11 + run: | + echo "PATH=/Users/username1/Downloads/zig-macos-x86_64-0.11.0:$PATH" >> $GITHUB_ENV + + - run: zig version - name: test_gen llvm tests run: cargo nextest-gen-llvm --release --no-fail-fast --locked -E "package(test_gen) - test(gen_str::str_append_scalar)" diff --git a/.github/workflows/nightly_linux_arm64.yml b/.github/workflows/nightly_linux_arm64.yml index a91424efeab..a04fc62b4cc 100644 --- a/.github/workflows/nightly_linux_arm64.yml +++ b/.github/workflows/nightly_linux_arm64.yml @@ -10,15 +10,15 @@ jobs: name: build and package nightly release runs-on: [self-hosted, Linux, ARM64] timeout-minutes: 90 - env: - ROC_ZIG: /home/username/Downloads/zig-linux-aarch64-0.11.0/zig steps: - uses: actions/checkout@v3 - - run: | - zig version - $ROC_ZIG version + - name: Update PATH to use zig 11 + run: | + echo "PATH=/home/username/Downloads/zig-linux-aarch64-0.11.0:$PATH" >> $GITHUB_ENV + + - run: zig version - name: create version.txt run: ./ci/write_version.sh diff --git a/.github/workflows/nightly_linux_x86_64.yml b/.github/workflows/nightly_linux_x86_64.yml index 7e3483f6147..de36fd6c291 100644 --- a/.github/workflows/nightly_linux_x86_64.yml +++ b/.github/workflows/nightly_linux_x86_64.yml @@ -10,15 +10,15 @@ jobs: name: build and package nightly release runs-on: [self-hosted, i7-6700K] timeout-minutes: 90 - env: - ROC_ZIG: /home/big-ci-user/Downloads/zig-linux-x86_64-0.11.0/zig steps: - uses: actions/checkout@v3 - - run: | - zig version - $ROC_ZIG version + - name: Update PATH to use zig 11 + run: | + echo "PATH=/home/big-ci-user/Downloads/zig-linux-x86_64-0.11.0:$PATH" >> $GITHUB_ENV + + - run: zig version - name: create version.txt run: ./ci/write_version.sh diff --git a/.github/workflows/nightly_macos_apple_silicon.yml b/.github/workflows/nightly_macos_apple_silicon.yml index 42c222b37d2..10f04c934cd 100644 --- a/.github/workflows/nightly_macos_apple_silicon.yml +++ b/.github/workflows/nightly_macos_apple_silicon.yml @@ -10,14 +10,14 @@ jobs: name: Rust tests, build and package nightly release runs-on: [self-hosted, macOS, ARM64] timeout-minutes: 90 - env: - ROC_ZIG: /Users/m1ci/Downloads/zig-macos-aarch64-0.11.0/zig steps: - uses: actions/checkout@v3 - - run: | - zig version - $ROC_ZIG version + - name: Update PATH to use zig 11 + run: | + echo "PATH=/Users/m1ci/Downloads/zig-macos-aarch64-0.11.0:$PATH" >> $GITHUB_ENV + + - run: zig version - name: llvm version run: llc --version | grep LLVM diff --git a/.github/workflows/nightly_macos_x86_64.yml b/.github/workflows/nightly_macos_x86_64.yml index 01bd07a8e52..60fafed196e 100644 --- a/.github/workflows/nightly_macos_x86_64.yml +++ b/.github/workflows/nightly_macos_x86_64.yml @@ -10,14 +10,14 @@ jobs: name: build, test, package and upload nightly release runs-on: [self-hosted, macOS, X64] timeout-minutes: 120 - env: - ROC_ZIG: /Users/username1/Downloads/zig-macos-x86_64-0.11.0/zig steps: - uses: actions/checkout@v3 - - run: | - zig version - $ROC_ZIG version + - name: Update PATH to use zig 11 + run: | + echo "PATH=/Users/username1/Downloads/zig-macos-x86_64-0.11.0:$PATH" >> $GITHUB_ENV + + - run: zig version - name: write version to file run: ./ci/write_version.sh diff --git a/.github/workflows/ubuntu_x86_64.yml b/.github/workflows/ubuntu_x86_64.yml index 216444c13ba..a16bbd18ed4 100644 --- a/.github/workflows/ubuntu_x86_64.yml +++ b/.github/workflows/ubuntu_x86_64.yml @@ -17,7 +17,6 @@ jobs: timeout-minutes: 90 env: RUSTC_WRAPPER: /home/small-ci-user/.cargo/bin/sccache - ROC_ZIG: /home/small-ci-user/Downloads/zig-linux-x86_64-0.11.0/zig steps: - uses: actions/checkout@v3 @@ -27,8 +26,6 @@ jobs: - name: Update PATH to use zig 11 run: | echo "PATH=/home/small-ci-user/Downloads/zig-linux-x86_64-0.11.0:$PATH" >> $GITHUB_ENV - - - run: echo $PATH - run: zig version