mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
ci: use ubuntu-22.04 instead of 20.04 (#1795)
* 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:
12
.github/workflows/presubmit.yml
vendored
12
.github/workflows/presubmit.yml
vendored
@@ -13,16 +13,16 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
mainmatrix: [true]
|
||||
os: [ubuntu-20.04, macos-latest, windows-latest]
|
||||
os: [ubuntu-22.04, macos-latest, windows-latest]
|
||||
include:
|
||||
- os: ubuntu-20.04
|
||||
- os: ubuntu-22.04
|
||||
mainmatrix: true
|
||||
gl: 1
|
||||
extra: " gl"
|
||||
- os: ubuntu-20.04
|
||||
- os: ubuntu-22.04
|
||||
mainmatrix: false
|
||||
arch: arm
|
||||
- os: ubuntu-20.04
|
||||
- os: ubuntu-22.04
|
||||
mainmatrix: false
|
||||
arch: aarch64
|
||||
debug: 1
|
||||
@@ -55,10 +55,10 @@ jobs:
|
||||
run: ./presubmit.sh
|
||||
formatcheck:
|
||||
name: Check code format
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- 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
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# Arg used to specify non-'origin/main' comparison branch
|
||||
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
|
||||
CLANG_FORMAT_OUTPUT=$(git-clang-format --diff $ORIGIN_BRANCH --extensions c,cpp,h,hpp --binary $CLANG_BINARY)
|
||||
|
||||
Reference in New Issue
Block a user