Skip to content

Commit ddfb47b

Browse files
committed
add LLVM 18.x as a git submodule
This changeset is based on #346
1 parent c0cdde5 commit ddfb47b

File tree

20 files changed

+90
-316
lines changed

20 files changed

+90
-316
lines changed

.github/workflows/generate_versions.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ jobs:
1616
uses: actions/checkout@v4
1717
with:
1818
path: tmp
19+
submodules: true
1920

2021
- name: Checkout
2122
uses: actions/checkout@v4
2223
with:
2324
repository: paritytech/resolc-bin
2425
path: resolc-bin
26+
submodules: true
2527

2628
- uses: actions/create-github-app-token@v1
2729
id: app-token

.github/workflows/release-llvm.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
contents: write # for uploading assets to release
7272
steps:
7373
- uses: actions/checkout@v4
74+
with:
75+
submodules: true
7476
- uses: actions-rust-lang/setup-rust-toolchain@v1
7577
with:
7678
# without this it will override our rust flags
@@ -96,10 +98,6 @@ jobs:
9698
run: |
9799
cargo install --locked --force --path crates/llvm-builder
98100
99-
- name: Clone LLVM
100-
run: |
101-
revive-llvm --target-env ${{ matrix.builder-arg }} clone
102-
103101
- name: Build LLVM
104102
if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
105103
run: |

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
2828
steps:
2929
- uses: actions/checkout@v4
30+
with:
31+
submodules: true
3032

3133
- name: Check versions
3234
id: versions
@@ -130,6 +132,8 @@ jobs:
130132
environment: tags
131133
steps:
132134
- uses: actions/checkout@v4
135+
with:
136+
submodules: true
133137

134138
- name: Download Artifacts
135139
uses: actions/download-artifact@v4

.github/workflows/test-llvm-builder.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
branches: ["main"]
55
types: [opened, synchronize]
66
paths:
7-
- 'LLVM.lock'
87
- 'crates/llvm-builder/**'
98
- '.github/workflows/test-llvm-builder.yml'
109
paths-ignore:
@@ -25,6 +24,8 @@ jobs:
2524
runs-on: ${{ matrix.runner }}
2625
steps:
2726
- uses: actions/checkout@v4
27+
with:
28+
submodules: true
2829
- uses: actions-rust-lang/setup-rust-toolchain@v1
2930
with:
3031
# without this it will override our rust flags

.github/workflows/test-wasm.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
shell: bash
2727
steps:
2828
- uses: actions/checkout@v4
29+
with:
30+
submodules: true
2931
- uses: actions-rust-lang/setup-rust-toolchain@v1
3032
with:
3133
target: wasm32-unknown-emscripten
@@ -72,6 +74,8 @@ jobs:
7274
runs-on: ${{ matrix.os }}
7375
steps:
7476
- uses: actions/checkout@v4
77+
with:
78+
submodules: true
7579

7680
- name: Create Target Directory
7781
run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
runs-on: ubuntu-24.04
2323
steps:
2424
- uses: actions/checkout@v4
25+
with:
26+
submodules: true
2527
- uses: actions-rust-lang/setup-rust-toolchain@v1
2628
with:
2729
# without this it will override our rust flags

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ target-llvm
88
/*.yul
99
/*.ll
1010
/*.s
11-
/llvm*
11+
/llvm-*
12+
# Allow llvm submodule directory
13+
!/llvm
1214
node_modules
1315
artifacts
1416
tmp

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "llvm"]
2+
path = llvm
3+
url = https://github.com/llvm/llvm-project.git
4+
branch = release/18.x

Cargo.lock

Lines changed: 5 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LLVM.lock

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)