Use new linker in CI

juntyr · Dec 21, 2023 · f2ceec4 · f2ceec4
1 parent 523d4a9
commit f2ceec4
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,8 +26,12 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install libopenmpi-dev -y --no-install-recommends
 
-      - name: Install the Rust toolchain
-        run: cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked
+      - name: Install the rust-ptx-linker
+        run: |
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh
+          sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+")
+          rm llvm.sh
+          cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force
       
       - name: Check the default features
         run: cargo check
@@ -57,8 +61,12 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install libopenmpi-dev -y --no-install-recommends
 
-      - name: Install the Rust toolchain
-        run: cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked
+      - name: Install the rust-ptx-linker
+        run: |
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh
+          sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+")
+          rm llvm.sh
+          cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force
       
       - name: Run the test-suite
         run: cargo test --workspace --no-fail-fast
@@ -85,8 +93,12 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install libopenmpi-dev -y --no-install-recommends
 
-      - name: Install the Rust toolchain
-        run: cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked
+      - name: Install the rust-ptx-linker
+        run: |
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh
+          sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+")
+          rm llvm.sh
+          cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force
 
       - name: Check the code style for the default features
         run: cargo clippy -- -D warnings

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -36,10 +36,16 @@ jobs:
 
       - name: Install the Rust toolchain
         run: |
-          cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked
           cargo install grcov --force --locked
           rustup component add llvm-tools-preview
 
+      - name: Install the rust-ptx-linker
+        run: |
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh
+          sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+")
+          rm llvm.sh
+          cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force
+
       - name: Generate the code coverage
         run: |
           RUSTFLAGS="-Cinstrument-coverage" \

diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml
@@ -21,8 +21,12 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install libopenmpi-dev -y --no-install-recommends
 
-      - name: Install the Rust toolchain
-        run: cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked
+      - name: Install the rust-ptx-linker
+        run: |
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh
+          sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+")
+          rm llvm.sh
+          cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force
 
       - name: Build the Documentation
         run: |

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -13,7 +13,13 @@ RUN echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-sel
     sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub && \
     sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" && \
     sudo apt-get update -q && \
-    sudo apt-get install cuda -y --no-install-recommends
+    sudo apt-get install cuda -y --no-install-recommends && \
+    wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && \
+    sudo ./llvm.sh $(rustc --version -v | grep -oP "LLVM version: \K\d+") && \
+    rm llvm.sh && \
+    sudo apt-get clean autoclean && \
+    sudo apt-get autoremove -y && \
+    sudo rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 RUN sudo apt-get update -q && \
     sudo apt-get upgrade -y && \
@@ -25,6 +31,6 @@ RUN sudo apt-get update -q && \
     sudo apt-get autoremove -y && \
     sudo rm -rf /var/lib/{apt,dpkg,cache,log}/
 
-RUN cargo install ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force --locked && \
-    cargo install cargo-mpirun --force --locked && \
-    cargo install cargo-reaper --git https://github.com/juntyr/grim-reaper --force --locked
+RUN cargo install rust-ptx-linker --git https://github.com/juntyr/rust-ptx-linker --force && \
+    cargo install cargo-mpirun --force && \
+    cargo install cargo-reaper --git https://github.com/juntyr/grim-reaper --force