Skip to content

Commit 88e9410

Browse files
authored
Upgrade ubuntu-20.04 jobs (#743)
As per actions/runner-images#11101, the `ubuntu-20.04` pool is going to the GitHub Graveyard.
2 parents aa12a2e + d63df29 commit 88e9410

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -449,20 +449,11 @@ jobs:
449449
if: needs.ci-config.outputs.enabled == 'yes'
450450
env:
451451
jobname: sparse
452-
runs-on: ubuntu-20.04
452+
runs-on: ubuntu-22.04
453453
concurrency:
454454
group: sparse-${{ github.ref }}
455455
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
456456
steps:
457-
- name: Download a current `sparse` package
458-
# Ubuntu's `sparse` version is too old for us
459-
uses: git-for-windows/get-azure-pipelines-artifact@v0
460-
with:
461-
repository: git/git
462-
definitionId: 10
463-
artifact: sparse-20.04
464-
- name: Install the current `sparse` package
465-
run: sudo dpkg -i sparse-20.04/sparse_*.deb
466457
- uses: actions/checkout@v4
467458
- name: Install other dependencies
468459
run: ci/install-dependencies.sh

.github/workflows/scalar-functional-tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
# Order by runtime (in descending order)
23-
os: [windows-2019, macos-13, ubuntu-20.04, ubuntu-22.04]
23+
os: [windows-2019, macos-13, ubuntu-22.04]
2424
# Scalar.NET used to be tested using `features: [false, experimental]`
2525
# But currently, Scalar/C ignores `feature.scalar` altogether, so let's
2626
# save some electrons and run only one of them...
2727
features: [ignored]
2828
exclude:
2929
# The built-in FSMonitor is not (yet) supported on Linux
30-
- os: ubuntu-20.04
31-
features: experimental
3230
- os: ubuntu-22.04
3331
features: experimental
3432
runs-on: ${{ matrix.os }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ ARFLAGS = rcs
14241424
PTHREAD_CFLAGS =
14251425

14261426
# For the 'sparse' target
1427-
SPARSE_FLAGS ?= -std=gnu99
1427+
SPARSE_FLAGS ?= -std=gnu99 -D__STDC_NO_VLA__
14281428
SP_EXTRA_FLAGS =
14291429

14301430
# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak,address targets

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ StaticAnalysis)
119119
sparse)
120120
sudo apt-get -q update -q
121121
sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
122-
libexpat-dev gettext zlib1g-dev
122+
libexpat-dev gettext zlib1g-dev sparse
123123
;;
124124
Documentation)
125125
sudo apt-get -q update

0 commit comments

Comments
 (0)