Skip to content

Commit 45e3152

Browse files
stephan57160bluca
authored andcommitted
Upgrade generated CI to Ubuntu 24.04 (LTS).
1 parent b95c3bf commit 45e3152

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

zproject_gh_actions.gsl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,21 @@ jobs:
9090
fail-fast: false
9191
matrix:
9292
include:
93-
- os: ubuntu-20.04
93+
- os: ubuntu-24.04
9494
BUILD_TYPE: default
9595
DRAFT: enabled
96-
CLANG_FORMAT: clang-format-11
97-
PACKAGES: automake autoconf clang-format-11 $(packages) $(packages_doctools)
98-
- os: ubuntu-20.04
96+
CLANG_FORMAT: clang-format-18
97+
PACKAGES: automake autoconf clang-format-18 $(packages) $(packages_doctools)
98+
- os: ubuntu-24.04
9999
BUILD_TYPE: default
100100
DRAFT: disabled
101-
CLANG_FORMAT: clang-format-11
102-
PACKAGES: automake autoconf clang-format-11 $(packages)
103-
- os: ubuntu-20.04
101+
CLANG_FORMAT: clang-format-18
102+
PACKAGES: automake autoconf clang-format-18 $(packages)
103+
- os: ubuntu-24.04
104104
BUILD_TYPE: valgrind
105105
DRAFT: enabled
106106
PACKAGES: automake autoconf valgrind $(packages)
107-
- os: ubuntu-20.04
107+
- os: ubuntu-24.04
108108
BUILD_TYPE: cmake
109109
DRAFT: enabled
110110
PACKAGES: cmake $(packages)
@@ -119,37 +119,37 @@ jobs:
119119
.if project.gh_actions_clangformat_implem ?= "autotools" | ( !defined(project.gh_actions_clangformat_implem) & project.gh_actions_use_cmake ?= 0 )
120120
. echo "GHA: CLANG-FORMAT: implementation: autotools"
121121
### Note: we don't use CMake
122-
- os: ubuntu-20.04
122+
- os: ubuntu-24.04
123123
BUILD_TYPE: cmake
124124
DO_CLANG_FORMAT_CHECK: 1
125-
CLANG_FORMAT: clang-format-11
126-
PACKAGES: cmake clang-format-11 $(packages)
125+
CLANG_FORMAT: clang-format-18
126+
PACKAGES: cmake clang-format-18 $(packages)
127127
.endif
128128
# For non-cmake users, there is an autotools solution with a bit more overhead
129129
# to have dependencies ready and pass configure script before making this check).
130130
# Note that the autotools variant will also require dependencies preinstalled to
131131
# pass its configure script:
132132
.if project.gh_actions_clangformat_implem ?= "cmake" | ( !defined(project.gh_actions_clangformat_implem) & ( project.gh_actions_use_cmake ?= 1 | !defined(project.gh_actions_use_cmake) ) )
133133
. echo "GHA: CLANG-FORMAT: implementation: cmake"
134-
- os: ubuntu-20.04
134+
- os: ubuntu-24.04
135135
BUILD_TYPE: cmake
136136
DO_CLANG_FORMAT_CHECK: 1
137-
CLANG_FORMAT: clang-format-11
138-
PACKAGES: cmake clang-format-11 $(packages)
137+
CLANG_FORMAT: clang-format-18
138+
PACKAGES: cmake clang-format-18 $(packages)
139139
.endif
140140
.if project.gh_actions_check_abi_compliance ?= 1
141141
. if project.exports_classes
142142
# Note: the ABI compliance checker script currently assumes that:
143143
# 1) Your project sources have a "latest_release" branch or tag
144144
# to check out and compare the current commit's ABI to;
145145
# 2) Prerequisites are available as packages - no custom rebuilds.
146-
- os: ubuntu-20.04
146+
- os: ubuntu-24.04
147147
BUILD_TYPE: abi-compliance-checker
148148
PACKAGES: universal-ctags abi-dumper abi-compliance-checker $(packages)
149149
. endif
150150
.endif
151151
.if defined(project.gh_actions_check_zproject) & !(project.gh_actions_check_zproject ?= 0)
152-
- os: ubuntu-20.04
152+
- os: ubuntu-24.04
153153
BUILD_TYPE: check_zproject
154154
PACKAGES: $(packages) $(packages_zproject)
155155
.endif
@@ -203,12 +203,12 @@ false
203203
CI_SELFTEST: ${{ matrix.CI_SELFTEST }}
204204
steps:
205205
- name: Add debian packages
206-
if: matrix.os == 'ubuntu-20.04'
206+
if: matrix.os == 'ubuntu-24.04'
207207
uses: myci-actions/add-deb-repo@10
208208
with:
209209
repo-name: obs
210-
repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
211-
keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
210+
repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/ ./
211+
keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_24.04/Release.key
212212
install: ${{ matrix.PACKAGES }}
213213
- name: Add brew packages
214214
if: matrix.os == 'macos-latest'
@@ -218,7 +218,7 @@ false
218218
with:
219219
path: $(project.name)
220220
- name: build
221-
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
221+
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-latest'
222222
shell: bash
223223
working-directory: $(project.name)
224224
run: ./ci_build.sh

0 commit comments

Comments
 (0)