Skip to content

Commit 40fba59

Browse files
Emilio CoriglianoEmilioCorigliano
authored andcommitted
fix(pipeline): fix pipeline after bump to LLVM 21
1 parent af4f378 commit 40fba59

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: steps.llvm-cache.outputs.cache-hit != 'true'
2222
with:
2323
repository: llvm/llvm-project
24-
ref: llvmorg-16.0.6
24+
ref: llvmorg-21.1.8
2525
path: llvm-project
2626
- name: Compiling LLVM
2727
if: steps.llvm-cache.outputs.cache-hit != 'true'
@@ -65,5 +65,7 @@ jobs:
6565
shell: bash
6666
working-directory: ./ASPIS/testing
6767
run: |
68-
pytest test.py
68+
pytest test.py --tests-file config/tests.toml
69+
pytest test.py --tests-file config/racfed+eddi.toml
70+
pytest test.py --tests-file config/racfed.toml
6971

docker/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ RUN apt-get update && apt-get install -y \
2121
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 \
2222
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
2323

24-
# ==== Download LLVM 16.0.6
24+
# ==== Download LLVM 21.1.8
2525
WORKDIR /workspace/
2626

27-
RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz \
28-
&& tar -xf llvm-project-16.0.6.src.tar.xz
27+
RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/llvm-project-21.1.8.src.tar.xz \
28+
&& tar -xf llvm-project-21.1.8.src.tar.xz
2929

3030
# Download and install CMake 3.22.1
3131
RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-x86_64.tar.gz \
@@ -44,14 +44,14 @@ RUN wget https://apt.llvm.org/llvm.sh \
4444

4545
# LLVM CMAKE CONFIG
4646

47-
WORKDIR /workspace/llvm-project-16.0.6.src
47+
WORKDIR /workspace/llvm-project-21.1.8.src
4848

4949
RUN mkdir build \
5050
&& cd build \
5151
&& cmake -S ../llvm -B . -G "Ninja" -DCMAKE_BUILD_TYPE=Debug -DLLVM_ENABLE_PROJECTS='clang' -DLLVM_INSTALL_UTILS=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_INCLUDE_EwebXAMPLES=OFF -DLLVM_USE_LINKER=NO -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DLLVM_ENABLE_RTTI=OFF -DLLVM_ENABLE_EH=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CROSSCOMPILING=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
5252
&& ninja -j10
5353

54-
RUN export PATH=/home/ubuntu/llvm-project-16.0.6.src/build/bin:$PATH
54+
RUN export PATH=/home/ubuntu/llvm-project-21.1.8.src/build/bin:$PATH
5555

5656
# Install ASPIS
5757
WORKDIR /workspace/
@@ -62,11 +62,11 @@ ENV CXX=''
6262
RUN git clone https://github.com/HEAPLab/ASPIS.git \
6363
&& cd ASPIS \
6464
&& mkdir build \
65-
&& cmake -B build -DLLVM_DIR=/workspace/llvm-project-16.0.6.src/build/lib/cmake/llvm \
65+
&& cmake -B build -DLLVM_DIR=/workspace/llvm-project-21.1.8.src/build/lib/cmake/llvm \
6666
&& cmake --build build
6767

6868
# Set the working directory to where ASPIS is located
6969
WORKDIR /workspace/ASPIS
7070

7171
# Export path to add llvm binaries
72-
ENV PATH=/workspace/llvm-project-16.0.6.src/build/bin:$PATH
72+
ENV PATH=/workspace/llvm-project-21.1.8.src/build/bin:$PATH

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ services:
44
container_name: aspis_runner
55
volumes:
66
- .././testing/tests/:/workspace/ASPIS/tmp/
7-
entrypoint: ["/workspace/ASPIS/aspis.sh", "--llvm-bin", "/workspace/llvm-project-16.0.6.src/build/bin"]
7+
entrypoint: ["/workspace/ASPIS/aspis.sh", "--llvm-bin", "/workspace/llvm-project-21.1.8.src/build/bin"]

testing/config/llvm.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#llvm_bin = "<path/to/your/llvm/bin>"
2-
llvm_bin = "/mnt/build/bin/"
2+
llvm_bin = "/mnt/build/bin/"

0 commit comments

Comments
 (0)