Skip to content

Commit acb023b

Browse files
authored
Prepare release branch for LLVM 21.x (#3279)
1 parent 9413a66 commit acb023b

File tree

6 files changed

+9
-172
lines changed

6 files changed

+9
-172
lines changed

.github/workflows/check-code-style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
# launched, so, we need to setup llvm package to perform cmake
8080
# configuration step to generate that database
8181
curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
82-
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main" | sudo tee -a /etc/apt/sources.list
82+
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" | sudo tee -a /etc/apt/sources.list
8383
sudo apt-get update
8484
sudo apt-get install -yqq \
8585
clang-format-${{ env.LLVM_VERSION }} clang-tidy-${{ env.LLVM_VERSION }} \

.github/workflows/check-in-tree-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
7171
curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | sudo apt-key add -
72-
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main" | sudo tee -a /etc/apt/sources.list
72+
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" | sudo tee -a /etc/apt/sources.list
7373
echo "deb https://packages.lunarg.com/vulkan jammy main" | sudo tee -a /etc/apt/sources.list
7474
sudo apt-get update
7575
sudo apt-get -yq --no-install-suggests --no-install-recommends install \
@@ -82,7 +82,7 @@ jobs:
8282
uses: actions/checkout@v4
8383
with:
8484
repository: llvm/llvm-project
85-
ref: main
85+
ref: release/21.x
8686
path: llvm-project
8787
- name: Checkout the translator sources
8888
uses: actions/checkout@v4
@@ -137,7 +137,7 @@ jobs:
137137
uses: actions/checkout@v4
138138
with:
139139
repository: llvm/llvm-project
140-
ref: main
140+
ref: release/21.x
141141
path: llvm-project
142142
- name: Checkout the translator sources
143143
uses: actions/checkout@v4
@@ -189,7 +189,7 @@ jobs:
189189
uses: actions/checkout@v4
190190
with:
191191
repository: llvm/llvm-project
192-
ref: main
192+
ref: release/21.x
193193
path: llvm-project
194194
- name: Checkout the translator sources
195195
uses: actions/checkout@v4

.github/workflows/check-out-of-tree-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: |
6262
curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
6363
curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | sudo apt-key add -
64-
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy main" | sudo tee -a /etc/apt/sources.list
64+
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main" | sudo tee -a /etc/apt/sources.list
6565
echo "deb https://packages.lunarg.com/vulkan jammy main" | sudo tee -a /etc/apt/sources.list
6666
sudo apt-get update
6767
sudo apt-get -yq --no-install-suggests --no-install-recommends install \

.travis.yml

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

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.13.4)
22

33
if(NOT DEFINED BASE_LLVM_VERSION)
4-
set (BASE_LLVM_VERSION 21.0.0)
4+
set (BASE_LLVM_VERSION 21.1.0)
55
endif(NOT DEFINED BASE_LLVM_VERSION)
66
set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)
77

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LLVM/SPIR-V Bi-Directional Translator
22

3-
[![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions/workflows/check-out-of-tree-build.yml/badge.svg?branch=main&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22Out-of-tree+build+%26+tests%22+event%3Aschedule)
4-
[![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions/workflows/check-in-tree-build.yml/badge.svg?branch=main&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22In-tree+build+%26+tests%22+event%3Aschedule)
3+
[![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions/workflows/check-out-of-tree-build.yml/badge.svg?branch=llvm_release_210&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22Out-of-tree+build+%26+tests%22+event%3Aschedule)
4+
[![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions/workflows/check-in-tree-build.yml/badge.svg?branch=llvm_release_210&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22In-tree+build+%26+tests%22+event%3Aschedule)
55

66
This repository contains source code for the LLVM/SPIR-V Bi-Directional Translator, a library and tool for translation between LLVM IR and [SPIR-V](https://www.khronos.org/registry/spir-v/).
77
This project currently only supports the OpenCL/compute "flavour" of SPIR-V: it consumes and produces SPIR-V modules that declare the `Kernel` capability.

0 commit comments

Comments
 (0)