From 0b1fa7f7b7ebf29f9bfae50a3c480d8932683fb8 Mon Sep 17 00:00:00 2001 From: ainozaki Date: Wed, 20 Mar 2024 10:48:15 +0900 Subject: [PATCH] update CI --- .github/workflows/actions/setup/action.yaml | 17 ----------------- .github/workflows/ci.yaml | 10 +++++++--- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/actions/setup/action.yaml diff --git a/.github/workflows/actions/setup/action.yaml b/.github/workflows/actions/setup/action.yaml deleted file mode 100644 index 7c3d637..0000000 --- a/.github/workflows/actions/setup/action.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Setup - -runs: - using: composite - steps: - - name: Setup rust toolchain - uses: dtolnay/rust-toolchain@stable - - name: Install LLVM - shell: bash - run: | - export LLVM_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.0/clang+llvm-15.0.0-x86_64-linux-gnu-rhel-8.4.tar.xz - sudo mkdir -p /usr/local/llvm \ - && sudo wget ${LLVM_URL} -O /tmp/llvm.tar.xz \ - && sudo tar -xvf /tmp/llvm.tar.xz -C /usr/local/llvm \ - && sudo rm /tmp/llvm.tar.xz - echo "/usr/local/llvm/bin" >> $GITHUB_PATH - echo "LLVM_SYS_150_PREFIX=/usr/local/llvm/clang+llvm-15.0.0-x86_64-linux-gnu-rhel-8.4" >> $GITHUB_ENV diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ade7905..9ae1c3a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,9 @@ jobs: with: submodules: true - name: Setup - uses: ./.github/workflows/actions/setup + uses: dtolnay/rust-toolchain@stable + env: + LLVM_SYS_150_PREFIX: ${{ runner.home }}/.wasker/clang+llvm-15.0.0-x86_64-linux-gnu-rhel-8.4 - name: Run clippy run: cargo clippy --all-targets --all-features -- -D warnings test: @@ -30,6 +32,8 @@ jobs: with: submodules: true - name: Setup - uses: ./.github/workflows/actions/setup - - name: Run test + uses: dtolnay/rust-toolchain@stable + env: + LLVM_SYS_150_PREFIX: ${{ runner.home }}/.wasker/clang+llvm-15.0.0-x86_64-linux-gnu-rhel-8.4 + - name: Run test run: cargo test --all -- --nocapture