[CI] Get UBUNTU_BASE from lsb_release
This commit is contained in:
parent
95d845717f
commit
aeafe77a96
|
@ -54,8 +54,8 @@ jobs:
|
||||||
id: setup
|
id: setup
|
||||||
env:
|
env:
|
||||||
LLVM_VERSION: 19 # Same as Windows
|
LLVM_VERSION: 19 # Same as Windows
|
||||||
UBUNTU_BASE: noble
|
|
||||||
run: |
|
run: |
|
||||||
|
UBUNTU_BASE=$(lsb_release -cs)
|
||||||
echo "LLVM_VERSION=$LLVM_VERSION" >> "$GITHUB_OUTPUT"
|
echo "LLVM_VERSION=$LLVM_VERSION" >> "$GITHUB_OUTPUT"
|
||||||
echo "UBUNTU_BASE=$UBUNTU_BASE" >> "$GITHUB_OUTPUT"
|
echo "UBUNTU_BASE=$UBUNTU_BASE" >> "$GITHUB_OUTPUT"
|
||||||
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
||||||
|
@ -84,13 +84,12 @@ jobs:
|
||||||
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
|
||||||
sudo apt-add-repository "deb http://apt.llvm.org/${UBUNTU_BASE}/ llvm-toolchain-${UBUNTU_BASE}-${{ matrix.LLVM_VERSION }} main"
|
sudo apt-add-repository "deb http://apt.llvm.org/${UBUNTU_BASE}/ llvm-toolchain-${UBUNTU_BASE}-${{ matrix.LLVM_VERSION }} main"
|
||||||
sudo apt-get -y update
|
sudo apt-get -y update
|
||||||
sudo apt-get -y install mesa-vulkan-drivers valgrind libc++-dev libc++abi-dev libgtk-3-dev libsdl2-dev libvulkan-dev libx11-xcb-dev clang-${{ matrix.LLVM_VERSION }} llvm-${{ matrix.LLVM_VERSION }} ninja-build
|
sudo apt-get -y install mesa-vulkan-drivers valgrind libc++-dev libc++abi-dev libgtk-3-dev libsdl2-dev libvulkan-dev libx11-xcb-dev clang-${{ matrix.LLVM_VERSION }} ninja-build
|
||||||
./xb setup
|
./xb setup
|
||||||
- name: Build
|
- name: Build
|
||||||
env:
|
env:
|
||||||
CC: clang-${{ matrix.LLVM_VERSION }}
|
CC: clang-${{ matrix.LLVM_VERSION }}
|
||||||
CXX: clang++-${{ matrix.LLVM_VERSION }}
|
CXX: clang++-${{ matrix.LLVM_VERSION }}
|
||||||
AR: llvm-ar-${{ matrix.LLVM_VERSION }}
|
|
||||||
run: ./xb build --config=Release
|
run: ./xb build --config=Release
|
||||||
- name: Prepare artifacts
|
- name: Prepare artifacts
|
||||||
id: prepare_artifacts
|
id: prepare_artifacts
|
||||||
|
|
Loading…
Reference in New Issue