Skip to content

Commit

Permalink
Switch to newer llvm 15 branch with blake3 fix (#29)
Browse files Browse the repository at this point in the history
See anza-xyz/llvm-project#68

Signed-off-by: Sean Young <[email protected]>
  • Loading branch information
seanyoung authored Oct 22, 2023
1 parent a7507fd commit 9a03962
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/[email protected]
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
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/[email protected]
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'
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
with:
submodules: recursive
- uses: dtolnay/[email protected]
- 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
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
with:
submodules: recursive
- uses: dtolnay/[email protected]
- 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
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
with:
submodules: recursive
- uses: dtolnay/[email protected]
- 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
uses: actions/[email protected]
- 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

0 comments on commit 9a03962

Please sign in to comment.