Fix CI (attempt #2). (#746)

* Workaround. * Disable other CI tasks. * Update `add-deb-repo` action. * Update the rest of jobs. * Fix stuff. * Fix stuff. * Fix stuff. * Fix `Dockerfile`. * Another attempt.
lambdaclass · Aug 1, 2024 · ec85d3d · ec85d3d
1 parent 3fba00d
commit ec85d3d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/bench-hyperfine.yml b/.github/workflows/bench-hyperfine.yml
@@ -6,7 +6,6 @@ on:
   merge_group:
     types: [checks_requested]
 
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -49,7 +48,7 @@ jobs:
           components: clippy
       - uses: Swatinem/rust-cache@v2
       - name: add llvm deb repository
-        uses: myci-actions/add-deb-repo@10
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
           repo-name: llvm-repo
@@ -77,7 +76,7 @@ jobs:
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
+          comment-author: "github-actions[bot]"
           body-includes: Benchmarking
       - name: Create or update bench comment
         continue-on-error: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
           components: clippy, rustfmt
       - uses: Swatinem/rust-cache@v2
       - name: add llvm deb repository
-        uses: myci-actions/add-deb-repo@10
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
           repo-name: llvm-repo
@@ -52,7 +52,7 @@ jobs:
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
+          comment-author: "github-actions[bot]"
           body-includes: thiscommentistofindthisformatcomment
       - name: Create or update comment
         continue-on-error: true
@@ -86,7 +86,7 @@ jobs:
       MLIR_SYS_180_PREFIX: /usr/lib/llvm-18/
       LLVM_SYS_181_PREFIX: /usr/lib/llvm-18/
       TABLEGEN_180_PREFIX: /usr/lib/llvm-18/
-      RUSTUP_TOOLCHAIN: nightly-2024-02-01  # udeps needs nightly
+      RUSTUP_TOOLCHAIN: nightly-2024-02-01 # udeps needs nightly
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
@@ -95,7 +95,7 @@ jobs:
           components: rustfmt
 
       - name: add llvm deb repository
-        uses: myci-actions/add-deb-repo@10
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
           repo-name: llvm-repo
@@ -173,6 +173,8 @@ jobs:
         uses: dtolnay/[email protected]
         with:
           components: clippy
+      - name: Rust `$PATH` workaround.
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - uses: Homebrew/actions/setup-homebrew@master
       - name: Install scarb
         uses: software-mansion/setup-scarb@v1
@@ -222,7 +224,7 @@ jobs:
       - name: Retreive cached dependecies
         uses: Swatinem/rust-cache@v2
       - name: add llvm deb repository
-        uses: myci-actions/add-deb-repo@10
+        uses: myci-actions/add-deb-repo@11
         with:
           repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
           repo-name: llvm-repo
@@ -252,7 +254,7 @@ jobs:
   upload-coverage:
     name: Upload Coverage
     runs-on: ubuntu-latest
-    needs: [ coverage ]
+    needs: [coverage]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Dockerfile b/Dockerfile
@@ -14,10 +14,11 @@ RUN apt update -y && apt install -y lsb-release \
 RUN echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-18 main" > /etc/apt/sources.list.d/llvm-18.list
 RUN echo "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-18 main" >> /etc/apt/sources.list.d/llvm-18.list
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-RUN apt update -y && apt install -y llvm-18 \
+RUN apt update -y && apt install -y \
     libmlir-18-dev \
-    mlir-18-tools \
-    libpolly-18-dev
+    libpolly-18-dev \
+    llvm-18-dev \
+    mlir-18-tools
 
 # Install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y