Skip to content

Commit abcd803

Browse files
Merge pull request #65 from muttleyxd/cmake-upgrade-fix
Fix: Ubuntu runner update
2 parents 547a011 + b51b326 commit abcd803

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/clang-tools-amd64.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: clang-tools-static-amd64
22

33
on:
44
push:
5-
branches: [ master]
5+
branches: [ master, cmake-upgrade-fix ]
66

77
jobs:
88
build:
@@ -53,7 +53,7 @@ jobs:
5353
- clang-version: 20
5454
release: llvm-project-20.1.0.src
5555
- os: linux
56-
runner: ubuntu-20.04
56+
runner: ubuntu-22.04
5757
os-cmake-args: '-DLLVM_BUILD_STATIC=ON -DCMAKE_CXX_FLAGS="-s -flto" ${POSIX_CMAKE_ARGS} ${LINUX_CMAKE_ARGS}'
5858
build-args: '-j$(nproc)'
5959
bindir: '/build/bin'
@@ -75,6 +75,11 @@ jobs:
7575
shacmd: 'sha512sum.exe'
7676
extra-tar-args: '--exclude=${RELEASE}/clang/test/Driver/Inputs/* --exclude=${RELEASE}/libcxx/test/std/input.output/filesystems/Inputs/static_test_env/* --exclude=${RELEASE}/libclc/amdgcn-mesa3d'
7777
extra-tar-args-cfe: '--exclude=cfe-${version}.src/test/Driver/Inputs/*'
78+
exclude:
79+
# TODO: macosx clang 18 is failing. Example: https://github.com/colinsullivan/clang-tools-static-binaries/actions/runs/14976168180/job/42068957048
80+
- os: macosx
81+
clang-version: 18
82+
7883
runs-on: ${{ matrix.runner }}
7984
env:
8085
COMMON_CMAKE_ARGS: '-DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"'
@@ -185,7 +190,7 @@ jobs:
185190
path: "${{ matrix.release }}${{ matrix.bindir }}/clang-*-${{ env.suffix }}*"
186191
retention-days: 1
187192
draft-release:
188-
runs-on: ubuntu-20.04
193+
runs-on: ubuntu-22.04
189194
needs: build
190195
steps:
191196
- name: download artifacts

0 commit comments

Comments
 (0)