From 9a039625911b5f1565ad5da4795b372a01dfcca8 Mon Sep 17 00:00:00 2001 From: Sean Young Date: Sun, 22 Oct 2023 15:28:42 +0100 Subject: [PATCH] Switch to newer llvm 15 branch with blake3 fix (#29) See https://github.com/solana-labs/llvm-project/pull/68 Signed-off-by: Sean Young --- .github/Dockerfile | 2 +- .github/workflows/build-llvm.yml | 10 +++++----- .github/workflows/ci-image.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 6e83931..e692640 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y libz-dev pkg-config libssl-dev git cmake ninja-build gcc g++ python3 file -RUN git clone --single-branch --branch solana-rustc/15.0-2022-08-09 \ +RUN git clone --single-branch --branch solana-rustc/15.0-2022-12-07 \ https://github.com/solana-labs/llvm-project.git WORKDIR /llvm-project diff --git a/.github/workflows/build-llvm.yml b/.github/workflows/build-llvm.yml index 60c6974..d6e5c92 100644 --- a/.github/workflows/build-llvm.yml +++ b/.github/workflows/build-llvm.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v3.1.0 with: submodules: recursive - - run: git clone --depth 1 --branch solana-rustc/15.0-2022-08-09 https://github.com/solana-labs/llvm-project.git + - run: git clone --depth 1 --branch solana-rustc/15.0-2022-12-07 https://github.com/solana-labs/llvm-project.git - name: Install Ninja uses: llvm/actions/install-ninja@main - run: cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_TERMINFO=Off @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v3.1.0 with: submodules: recursive - - run: git clone --depth 1 --branch solana-rustc/15.0-2022-08-09 https://github.com/solana-labs/llvm-project.git + - run: git clone --depth 1 --branch solana-rustc/15.0-2022-12-07 https://github.com/solana-labs/llvm-project.git - run: cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_TERMINFO=Off -DLLVM_ENABLE_LIBXML2=Off -DLLVM_ENABLE_ZLIB=Off -DLLVM_ENABLE_PROJECTS='clang;lld' @@ -72,7 +72,7 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@1.64.0 - - run: git clone --depth 1 --branch solana-rustc/15.0-2022-08-09 https://github.com/solana-labs/llvm-project.git + - run: git clone --depth 1 --branch solana-rustc/15.0-2022-12-07 https://github.com/solana-labs/llvm-project.git # We may not have enough space to compile llvm, see https://github.com/actions/virtual-environments/issues/326 working-directory: C:\ - name: Setup Windows @@ -108,7 +108,7 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@1.64.0 - - run: git clone --depth 1 --branch solana-rustc/15.0-2022-08-09 https://github.com/solana-labs/llvm-project.git + - run: git clone --depth 1 --branch solana-rustc/15.0-2022-12-07 https://github.com/solana-labs/llvm-project.git - name: Install Ninja uses: llvm/actions/install-ninja@main - run: cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_TERMINFO=Off @@ -141,7 +141,7 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@1.64.0 - - run: git clone --depth 1 --branch solana-rustc/15.0-2022-08-09 https://github.com/solana-labs/llvm-project.git + - run: git clone --depth 1 --branch solana-rustc/15.0-2022-12-07 https://github.com/solana-labs/llvm-project.git - name: Install Ninja uses: llvm/actions/install-ninja@main - run: cmake -G Ninja -DLLVM_ENABLE_ASSERTIONS=On -DLLVM_ENABLE_TERMINFO=Off diff --git a/.github/workflows/ci-image.yml b/.github/workflows/ci-image.yml index 5ca0fa9..25580dd 100644 --- a/.github/workflows/ci-image.yml +++ b/.github/workflows/ci-image.yml @@ -8,4 +8,4 @@ jobs: uses: actions/checkout@v3.1.0 - run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker buildx build --provenance=false --platform linux/amd64,linux/arm64 -t ghcr.io/${GITHUB_REPOSITORY}:ci-5 --push .github + docker buildx build --provenance=false --platform linux/amd64,linux/arm64 -t ghcr.io/${GITHUB_REPOSITORY}:ci-6 --push .github