diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8f124d4..94203b95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ on: env: CARGO_TERM_COLOR: always + LLVM_TARGET: x86_64-unknown-linux-musl jobs: llvm: @@ -56,10 +57,9 @@ jobs: - stable - beta - nightly - llvm: - - 19 - - source - name: rustc=${{ matrix.rust }} llvm=${{ matrix.llvm }} + target: + - x86_64-unknown-linux-musl + name: rustc=${{ matrix.rust }} target=${{ matrix.target }} needs: llvm env: @@ -81,7 +81,7 @@ jobs: toolchain: ${{ matrix.rust }} components: rust-src # TODO: Remove this and run the integration tests on the local machine when they pass on 5.15. - targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl + targets: ${{ matrix.target }} - uses: Swatinem/rust-cache@v2 @@ -91,51 +91,29 @@ jobs: - name: Build (default features, no system LLVM) run: cargo build - - name: Install dependencies - if: matrix.rust == 'nightly' - # ubuntu-22.04 comes with clang 14[0] which doesn't include support for signed and 64bit - # enum values which was added in clang 15[1]. - # - # gcc-multilib provides at least which is referenced by libbpf. - # - # llvm provides llvm-objcopy which is used to build the BTF relocation tests. - # - # [0] https://github.com/actions/runner-images/blob/ubuntu22/20230724.1/images/linux/Ubuntu2204-Readme.md - # - # [1] https://github.com/llvm/llvm-project/commit/dc1c43d - run: | - set -euxo pipefail - wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc - echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main | sudo tee /etc/apt/sources.list.d/llvm.list - sudo apt update - sudo apt -y install clang gcc-multilib - - - name: Install LLVM - if: matrix.llvm != 'source' - run: | - set -euxo pipefail - wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc - echo -e deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.llvm }} main | sudo tee /etc/apt/sources.list.d/llvm.list - - sudo apt update - # TODO(vadorovsky): Remove the requirement of libpolly. - # - # Packages from apt.llvm.org are being built all at once, with one - # cmake build with superset of options, then different binaries and - # libraries are being included in different packages. - # - # That results in `llvm-config --libname --link-static` mentioning - # libpolly, even if it's not installed. The output of that command is - # being used in build.rs of llvm-sys, so building llvm-sys on such - # system is complaining about lack of libpolly. - # - # Hopefully that nightmare goes away once we switch to binstalls and - # ditch the system LLVM option. - sudo apt -y install llvm-${{ matrix.llvm }}-dev libpolly-${{ matrix.llvm }}-dev - echo /usr/lib/llvm-${{ matrix.llvm }}/bin >> $GITHUB_PATH + # - name: Install dependencies + # if: matrix.rust == 'nightly' + # # ubuntu-22.04 comes with clang 14[0] which doesn't include support for signed and 64bit + # # enum values which was added in clang 15[1]. + # # + # # gcc-multilib provides at least which is referenced by libbpf. + # # + # # llvm provides llvm-objcopy which is used to build the BTF relocation tests. + # # + # # [0] https://github.com/actions/runner-images/blob/ubuntu22/20230724.1/images/linux/Ubuntu2204-Readme.md + # # + # # [1] https://github.com/llvm/llvm-project/commit/dc1c43d + # run: | + # run: | + # set -euxo pipefail + # wget https://ci-artifacts.rust-lang.org/rustc-builds/${{ env.LLVM_SHA }}/rust-dev-nightly-${{ env.LLVM_TARGET }}.tar.xz + # set -euxo pipefail + # wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc + # echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main | sudo tee /etc/apt/sources.list.d/llvm.list + # sudo apt update + # sudo apt -y install clang gcc-multilib - name: Restore LLVM - if: matrix.llvm == 'source' uses: actions/cache/restore@v4 with: path: llvm-install @@ -143,7 +121,6 @@ jobs: fail-on-cache-miss: true - name: Add LLVM to PATH && LD_LIBRARY_PATH - if: matrix.llvm == 'source' run: | set -euxo pipefail echo "${{ github.workspace }}/llvm-install/bin" >> $GITHUB_PATH diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index bef08b21..efb01aab 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -9,6 +9,10 @@ on: jobs: llvm: runs-on: ubuntu-22.04 + strategy: + matrix: + target: + - x86_64-unknown-linux-musl name: llvm outputs: cache-key: ${{ steps.cache-key.outputs.cache-key }} @@ -16,11 +20,11 @@ jobs: - id: ls-remote run: | set -euxo pipefail - value=$(git ls-remote https://github.com/aya-rs/llvm-project.git refs/heads/rustc/19.1-2024-07-30 | cut -f1) + value=$(git ls-remote https://github.com/rust-lang/llvm-project.git refs/heads/rustc/19.1-2024-07-30 | cut -f1) echo "sha=$value" >> "$GITHUB_OUTPUT" - id: cache-key - run: echo "cache-key=llvm-${{ steps.ls-remote.outputs.sha }}-1" >> "$GITHUB_OUTPUT" + run: echo "cache-key=llvm-${{ matrix.target }}-${{ steps.ls-remote.outputs.sha }}-1" >> "$GITHUB_OUTPUT" - name: Cache id: cache-llvm @@ -30,8 +34,22 @@ jobs: key: ${{ steps.cache-key.outputs.cache-key }} lookup-only: true - - name: Install Tools + - name: Download LLVM from Rust CI + id: download-llvm if: steps.cache-llvm.outputs.cache-hit != 'true' + run: + wget https://ci-artifacts.rust-lang.org/rustc-builds/${{ steps.ls-remote.outputs.sha }}/rust-dev-nightly-${{ matrix.target }}.tar.xz && \ + echo "download-llvm=success" << "$GITHUB_OUTPUT" || \ + echo "download-llvm=failure" << "$GITHUB_OUTPUT" + + - name: Save downloaded LLVM in cache + if: steps.download-llvm.outputs.success == 'true' + run: | + set -euxo pipefail + tar -xpf rust-dev-nightly-${{ env.LLVM_TARGET }}.tar.xz --strip-components 1 -C llvm-install + + - name: Install Tools + if: steps.cache-llvm.outputs.cache-hit != 'true' && steps.download-llvm.outputs.success != 'true' run: | set -euxo pipefail wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ @@ -44,7 +62,7 @@ jobs: sudo apt -y install cmake ninja-build clang lld - name: Checkout LLVM Source - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: steps.cache-llvm.outputs.cache-hit != 'true' && steps.download-llvm.outputs.success != 'true' uses: actions/checkout@v4 with: repository: aya-rs/llvm-project @@ -52,7 +70,7 @@ jobs: path: llvm-project - name: Configure LLVM - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: steps.cache-llvm.outputs.cache-hit != 'true' && steps.download-llvm.outputs.success != 'true' run: | set -euxo pipefail cmake \ @@ -73,7 +91,7 @@ jobs: -DLLVM_USE_LINKER=lld - name: Install LLVM - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: steps.cache-llvm.outputs.cache-hit != 'true' && steps.download-llvm.outputs.success != 'true' env: # Create symlinks rather than copies to conserve disk space. At the time of this writing, # GitHub-hosted runners have 14GB of SSD space @@ -85,7 +103,7 @@ jobs: run: cmake --build llvm-build --target install - name: Rewrite LLVM Symlinks - if: steps.cache-llvm.outputs.cache-hit != 'true' + if: steps.cache-llvm.outputs.cache-hit != 'true' && steps.download-llvm.outputs.success != 'true' # Move targets over the symlinks that point to them. # # This whole dance would be simpler if CMake supported CMAKE_INSTALL_MODE=MOVE. diff --git a/Cargo.lock b/Cargo.lock index d1edbeb5..450dda72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,7 +81,7 @@ dependencies = [ "cargo_metadata", "libc", "libloading", - "llvm-sys", + "llvm-sys 180.0.0", "once_cell", "prettyplease", "quote", @@ -112,7 +112,7 @@ dependencies = [ "compiletest_rs", "gimli", "libc", - "llvm-sys", + "llvm-sys 191.0.0-rc1", "log", "regex", "rustc-build-sysroot", @@ -459,6 +459,20 @@ dependencies = [ "semver", ] +[[package]] +name = "llvm-sys" +version = "191.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc981f56df5430a462d0f7676913fe9e8e4c8cc4df02e3157a6e3d808f7ae443" +dependencies = [ + "anyhow", + "cc", + "lazy_static", + "libc", + "regex-lite", + "semver", +] + [[package]] name = "log" version = "0.4.22"