ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: use ubuntu-22.04 instead of 20.04 (#1795)

Browse Source 
* ci: use ubuntu-22.04 instead of 20.04

Signed-off-by: Kevin Petit <kevin.petit@arm.com>

* bump clang-format version

Oldest supported by 22.04

* update check-format script

---------

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kévin Petit
2023-08-22 18:13:22 +01:00
committed by GitHub
parent 0702f2ecee
commit ddbb0de4b9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/presubmit.yml vendored
View File

@@ -13,16 +13,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
mainmatrix: [true] mainmatrix: [true]
os: [ubuntu-20.04, macos-latest, windows-latest] os: [ubuntu-22.04, macos-latest, windows-latest]
include: include:
- os: ubuntu-20.04 - os: ubuntu-22.04
mainmatrix: true mainmatrix: true
gl: 1 gl: 1
extra: " gl" extra: " gl"
- os: ubuntu-20.04 - os: ubuntu-22.04
mainmatrix: false mainmatrix: false
arch: arm arch: arm
- os: ubuntu-20.04 - os: ubuntu-22.04
mainmatrix: false mainmatrix: false
arch: aarch64 arch: aarch64
debug: 1 debug: 1
@@ -55,10 +55,10 @@ jobs:
run: ./presubmit.sh run: ./presubmit.sh
formatcheck: formatcheck:
name: Check code format name: Check code format
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Install packages - name: Install packages
run: sudo apt install -y clang-format clang-format-9 run: sudo apt install -y clang-format clang-format-11
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0

2
check-format.sh
View File

@@ -2,7 +2,7 @@
# Arg used to specify non-'origin/main' comparison branch # Arg used to specify non-'origin/main' comparison branch
ORIGIN_BRANCH=${1:-"origin/main"} ORIGIN_BRANCH=${1:-"origin/main"}
CLANG_BINARY=${2:-"`which clang-format-9`"} CLANG_BINARY=${2:-"`which clang-format-11`"}
# Run git-clang-format to check for violations # Run git-clang-format to check for violations
CLANG_FORMAT_OUTPUT=$(git-clang-format --diff $ORIGIN_BRANCH --extensions c,cpp,h,hpp --binary $CLANG_BINARY) CLANG_FORMAT_OUTPUT=$(git-clang-format --diff $ORIGIN_BRANCH --extensions c,cpp,h,hpp --binary $CLANG_BINARY)