Skip to content

Commit 7a18c63

Browse files
authored
Fix CI builds again (#5590)
I noticed that the CI builds of `shears/main` were failing, as well as the PR builds of #5586. The reasons are outside of Git for Windows, but the fixes need to be inside anyway.
2 parents 16d82dc + 419e29e commit 7a18c63

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/main.yml

+1-10
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

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ ARFLAGS = rcs
14181418
PTHREAD_CFLAGS =
14191419

14201420
# For the 'sparse' target
1421-
SPARSE_FLAGS ?= -std=gnu99
1421+
SPARSE_FLAGS ?= -std=gnu99 -D__STDC_NO_VLA__
14221422
SP_EXTRA_FLAGS =
14231423

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

ci/install-dependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ alpine-*)
3131
;;
3232
fedora-*|almalinux-*)
3333
dnf -yq update >/dev/null &&
34-
dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
34+
dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
3535
;;
3636
ubuntu-*|i386/ubuntu-*|debian-*)
3737
# Required so that apt doesn't wait for user input on certain packages.
@@ -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)