diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56f85f1a..a1a7955b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,6 @@ on: env: CARGO_TERM_COLOR: always - LLVM_VERSION: "20.1" jobs: build-linux: @@ -22,9 +21,11 @@ jobs: - os: ubuntu-24.04 target: x86_64-unknown-linux-gnu arch: linux-x86_64 + llvm: X64 - os: ubuntu-24.04-arm target: aarch64-unknown-linux-gnu arch: linux-aarch64 + llvm: ARM64 steps: - uses: actions/checkout@v4 with: @@ -33,6 +34,8 @@ jobs: with: target: ${{ matrix.target }} rustflags: "" + - name: Set LLVM_VERSION + run: echo "LLVM_VERSION=$(rustc --version --verbose | grep "LLVM version" | cut -d':' -f2 | xargs)" >> $GITHUB_ENV - name: Install SDL Dependencies # https://wiki.libsdl.org/SDL3/README-linux#build-dependencies uses: awalsh128/cache-apt-pkgs-action@v1 @@ -48,7 +51,8 @@ jobs: - name: Install LLVM and Clang uses: KyleMayes/install-llvm-action@v2 with: - version: "${{ env.LLVM_VERSION }}" + version: ${{ env.LLVM_VERSION }} + force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-Linux-${{ matrix.llvm }}.tar.xz - name: Build run: | cargo build --release -v --target=${{ matrix.target }} @@ -69,9 +73,11 @@ jobs: - os: windows-2025 target: x86_64-pc-windows-msvc arch: windows-x86_64 + llvm: win64 #- os: windows-11-arm # target: aarch64-pc-windows-msvc # arch: windows-aarch64 + # llvm: woa64 steps: - uses: actions/checkout@v4 with: @@ -80,10 +86,15 @@ jobs: with: target: ${{ matrix.target }} rustflags: "" + - name: Set LLVM_VERSION + run: | + $llvm_version = rustc --version --verbose | Select-String "LLVM version" | ForEach-Object { $_.Line.Split(":")[1].Trim() } + echo "LLVM_VERSION=$llvm_version" >> $env:GITHUB_ENV - name: Install LLVM and Clang uses: KyleMayes/install-llvm-action@v2 with: - version: "${{ env.LLVM_VERSION }}" + version: ${{ env.LLVM_VERSION }} + force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-${{ matrix.llvm }}.exe - name: Build run: | cargo build --release -v --target=${{ matrix.target }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 50bc48fd..c873dc99 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,6 @@ permissions: env: CARGO_TERM_COLOR: always - LLVM_VERSION: "20.1" jobs: lint-linux: @@ -23,6 +22,8 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: components: clippy, rustfmt + - name: Set LLVM_VERSION + run: echo "LLVM_VERSION=$(rustc --version --verbose | grep "LLVM version" | cut -d':' -f2 | xargs)" >> $GITHUB_ENV - name: Install SDL Dependencies # https://wiki.libsdl.org/SDL3/README-linux#build-dependencies uses: awalsh128/cache-apt-pkgs-action@v1 @@ -38,7 +39,8 @@ jobs: - name: Install LLVM and Clang uses: KyleMayes/install-llvm-action@v2 with: - version: "${{ env.LLVM_VERSION }}" + version: ${{ env.LLVM_VERSION }} + force-url: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.LLVM_VERSION }}/LLVM-${{ env.LLVM_VERSION }}-Linux-X64.tar.xz - name: Rustfmt Check uses: actions-rust-lang/rustfmt@v1 - name: Lint