From 8d93983b96fc8b0bce8f5ccaba30d3a189768d4d Mon Sep 17 00:00:00 2001 From: Brandon Ros Date: Mon, 21 Sep 2026 20:41:09 -0400 Subject: [PATCH 1/2] Point LLVM 21 prebuilt URLs at the upstream release The Rust-GPU/rustc_codegen_nvvm-llvm llvm-21.1.8 release is now published, so the CI fallback and guide example no longer need the fork. Co-Authored-By: Claude Fable 5.1 --- .github/workflows/ci_linux.yml | 2 +- guide/src/guide/getting_started.md | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 8658e552..be6aaf11 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -131,7 +131,7 @@ jobs: if: matrix.variance.llvm == 21 env: LLVM_ARCH: ${{ matrix.variance.artifact }} - PREBUILT_LLVM_URL: ${{ vars.PREBUILT_LLVM_URL || 'https://github.com/brandonros/rustc_codegen_nvvm-llvm/releases/download/llvm-21.1.8' }} + PREBUILT_LLVM_URL: ${{ vars.PREBUILT_LLVM_URL || 'https://github.com/Rust-GPU/rustc_codegen_nvvm-llvm/releases/download/llvm-21.1.8' }} run: | mkdir -p llvm-prebuilt curl --fail --location --retry 3 \ diff --git a/guide/src/guide/getting_started.md b/guide/src/guide/getting_started.md index f1119a17..630b5f2d 100644 --- a/guide/src/guide/getting_started.md +++ b/guide/src/guide/getting_started.md @@ -33,7 +33,7 @@ appends `linux-x86_64.tar.xz`, `linux-aarch64.tar.xz`, or `windows-x86_64.tar.xz` for the host platform. ```sh -export PREBUILT_LLVM_URL=https://github.com/brandonros/rustc_codegen_nvvm-llvm/releases/download/llvm-21.1.8 +export PREBUILT_LLVM_URL=https://github.com/Rust-GPU/rustc_codegen_nvvm-llvm/releases/download/llvm-21.1.8 USE_PREBUILT_LLVM=1 cargo build -p rustc_codegen_nvvm --features llvm21 ``` @@ -42,9 +42,8 @@ used only if local discovery fails. Select archives matching the backend's LLVM version; the override also applies to LLVM 7 builds. Linux CI accepts the same directory through the repository Actions variable -`PREBUILT_LLVM_URL`. Its LLVM 21 jobs default to the release above, whose -three archives match the artifacts from -[run 34781677658](https://github.com/brandonros/rustc_codegen_nvvm-llvm/actions/runs/34781677658). +`PREBUILT_LLVM_URL`. Its LLVM 21 jobs default to the release above, which is +also the backend's built-in default. ## CUDA basics From 44ff9e005403a813067743e6192e4dfe90a58b24 Mon Sep 17 00:00:00 2001 From: Brandon Ros Date: Tue, 22 Sep 2026 20:30:49 -0400 Subject: [PATCH 2/2] ci: fix digest artifact pattern matching llvm21 image digests The merge job for rust-cuda-ubuntu24-cuda13 downloaded digests-rust-cuda-ubuntu24-cuda13-*, which also matched the rust-cuda-ubuntu24-cuda13-llvm21 artifacts, so imagetools create failed looking up llvm21 digests in the cuda13 repo. Put the arch first so the image name is the anchored suffix of the pattern. Co-Authored-By: Claude Opus 5.5 (1M context) --- .github/workflows/container_images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_images.yml b/.github/workflows/container_images.yml index 0f7eb5b7..0c4759c5 100644 --- a/.github/workflows/container_images.yml +++ b/.github/workflows/container_images.yml @@ -140,7 +140,7 @@ jobs: if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: - name: digests-${{ env.ARTIFACT_NAME }}-${{ matrix.platform.arch }} + name: digests-${{ matrix.platform.arch }}-${{ env.ARTIFACT_NAME }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -178,7 +178,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-${{ env.ARTIFACT_NAME }}-* + pattern: digests-*-${{ env.ARTIFACT_NAME }} merge-multiple: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3