diff options
| author | Kévin Petit <kpet@free.fr> | 2023-08-22 18:13:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-22 18:13:22 +0100 |
| commit | ddbb0de4b9864b82e1012653b6faa06e1a80ec62 (patch) | |
| tree | 15c4ac1e1ca21e2c250438df535453137c9b8574 | |
| parent | 0702f2ecee4b250818a7fe289508ef9c54c1b48e (diff) | |
| download | OpenCL-CTS-ddbb0de4b9864b82e1012653b6faa06e1a80ec62.tar.gz | |
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>
| -rw-r--r-- | .github/workflows/presubmit.yml | 12 | ||||
| -rwxr-xr-x | check-format.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 1ba63abd..635e4a7e 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -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 diff --git a/check-format.sh b/check-format.sh index be8f9d78..b5dc0a72 100755 --- a/check-format.sh +++ b/check-format.sh @@ -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) |