From fd2f5b3726b65031f751a3bc1349eeb6bf6ffc0e Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sun, 2 Oct 2022 18:22:14 +0200 Subject: workflows: tentatively build on ubuntu22 --- .github/workflows/Test.yml | 6 +++--- scripts/ci-run.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 0a464ddc3..164b6ec73 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -156,12 +156,12 @@ jobs: fail-fast: false matrix: include: - - { os: 18, backend: mcode } - { os: 20, backend: mcode } - - { os: 18, backend: llvm-5.0 } + - { os: 22, backend: mcode } - { os: 20, backend: llvm-10 } - - { os: 18, backend: gcc-8.3.0 } + - { os: 22, backend: llvm-12 } - { os: 20, backend: gcc-9.3.0 } + - { os: 22, backend: gcc-11.2.0 } steps: diff --git a/scripts/ci-run.sh b/scripts/ci-run.sh index ecfd6e358..99585ae23 100755 --- a/scripts/ci-run.sh +++ b/scripts/ci-run.sh @@ -386,7 +386,7 @@ ci_run () { tests="sanity" case "$GHDL_IMAGE_TAG" in - *ubuntu20*|*buster*|*bullseye*) + *ubuntu22*|*ubuntu20*|*buster*|*bullseye*) GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" gstart "[CI] Docker build $GHDL_TEST_IMAGE" "$ANSI_BLUE" docker build -t "$GHDL_TEST_IMAGE" . -f- <<-EOF -- cgit v1.2.3