Skip to content

Commit 68dcf2e

Browse files
committed
[CI] Adjust build triggers of GitHub Action workflows
The tags-ignore: element actually has a syntax problem, to ignore tags, one should just not add either tags: or tags-ignore:. Instead, one should just add a branches: filter on push:.
1 parent 5da24e1 commit 68dcf2e

6 files changed

Lines changed: 22 additions & 35 deletions

File tree

.github/workflows/CI.yml

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ permissions:
55

66
on:
77
push:
8-
tags-ignore:
8+
branches:
9+
- '**'
910
pull_request:
1011
workflow_dispatch:
1112

@@ -46,15 +47,14 @@ jobs:
4647
g++ \
4748
git \
4849
gtest-dev \
50+
isa-l-dev \
4951
json-c-dev \
5052
krb5 \
5153
krb5-dev \
5254
krb5-server \
5355
libxml2-dev \
54-
libzip-dev \
5556
linux-headers \
5657
make \
57-
nlohmann-json \
5858
openssl \
5959
openssl-dev \
6060
procps \
@@ -64,12 +64,13 @@ jobs:
6464
python3-dev \
6565
readline-dev \
6666
sudo \
67+
tinyxml-dev \
6768
util-linux-dev \
6869
uuidgen \
6970
zlib-dev
7071
7172
- name: Clone repository
72-
uses: actions/checkout@v6
73+
uses: actions/checkout@v4
7374
with:
7475
fetch-depth: 0
7576

@@ -103,7 +104,7 @@ jobs:
103104
dnf config-manager --set-enabled powertools
104105
105106
- name: Clone repository
106-
uses: actions/checkout@v6
107+
uses: actions/checkout@v4
107108
with:
108109
fetch-depth: 0
109110

@@ -139,7 +140,7 @@ jobs:
139140
dnf config-manager --set-enabled crb
140141
141142
- name: Clone repository
142-
uses: actions/checkout@v6
143+
uses: actions/checkout@v4
143144
with:
144145
fetch-depth: 0
145146

@@ -160,7 +161,7 @@ jobs:
160161
tests/post-install.sh
161162
tests/check-headers.sh
162163
163-
alma10:
164+
alma10beta:
164165
name: Alma 10
165166
runs-on: ubuntu-latest
166167
container: almalinux:10
@@ -175,7 +176,7 @@ jobs:
175176
dnf config-manager --set-enabled crb
176177
177178
- name: Clone repository
178-
uses: actions/checkout@v6
179+
uses: actions/checkout@v4
179180
with:
180181
fetch-depth: 0
181182

@@ -201,24 +202,16 @@ jobs:
201202
runs-on: ubuntu-latest
202203
container: fedora
203204

204-
strategy:
205-
matrix:
206-
compiler: [ 'gcc', 'clang' ]
207-
config: [ 'Debug', 'Release' ]
208-
fail-fast: false
209-
210205
env:
211-
CC: ${{ matrix.compiler }}
212-
CMAKE_ARGS: "-DCMAKE_INSTALL_PREFIX=/usr;-DCMAKE_INSTALL_RPATH='$ORIGIN/../$LIB'"
213-
CMAKE_BUILD_TYPE: ${{ matrix.config }}
214206
CMAKE_GENERATOR: Ninja
207+
CMAKE_ARGS: "-DCMAKE_INSTALL_PREFIX=/usr;-DCMAKE_INSTALL_RPATH='$ORIGIN/../$LIB'"
215208

216209
steps:
217210
- name: Install dependencies
218-
run: dnf install -y dnf-plugins-core git ninja-build rpmdevtools ${{ matrix.compiler }}
211+
run: dnf install -y dnf-plugins-core git ninja-build rpmdevtools
219212

220213
- name: Clone repository
221-
uses: actions/checkout@v6
214+
uses: actions/checkout@v4
222215
with:
223216
fetch-depth: 0
224217

@@ -229,7 +222,7 @@ jobs:
229222
run: dnf builddep -y --define 'with_ceph 1' xrootd.spec
230223

231224
- name: Build and Test with CTest
232-
run: sudo -E -u runner env CC=${CC} CXX=${CC/g*/g++} ctest -VV -S test.cmake
225+
run: sudo -E -u runner ctest -VV -S test.cmake
233226

234227
- name: Install with CMake
235228
run: cmake --install build
@@ -246,16 +239,13 @@ jobs:
246239
matrix:
247240
os: [ '24.04', '24.04-arm' ]
248241
compiler: [ 'gcc', 'clang' ]
249-
config: [ 'Debug', 'Release' ]
250-
fail-fast: false
251242

252243
runs-on: ubuntu-${{ matrix.os }}
253244

254245
env:
255246
CC: ${{ matrix.compiler }}
256-
CMAKE_BUILD_TYPE: ${{ matrix.config }}
257-
CMAKE_ARGS: '-DINSTALL_PYTHON_BINDINGS=0;-DCMAKE_INSTALL_PREFIX=/usr'
258247
DEBIAN_FRONTEND: noninteractive
248+
CMAKE_ARGS: '-DINSTALL_PYTHON_BINDINGS=0;-DCMAKE_INSTALL_PREFIX=/usr'
259249

260250
steps:
261251
- name: Install development tools
@@ -264,7 +254,7 @@ jobs:
264254
sudo apt install -y build-essential devscripts equivs git
265255
266256
- name: Clone repository
267-
uses: actions/checkout@v6
257+
uses: actions/checkout@v4
268258
with:
269259
fetch-depth: 0
270260

@@ -281,7 +271,7 @@ jobs:
281271
run: |
282272
sudo python3 -m pip install \
283273
--target /usr/lib/python3/dist-packages \
284-
--use-pep517 --verbose build/python
274+
--use-pep517 --verbose build/bindings/python
285275
286276
- name: Run post-install tests
287277
run: |
@@ -290,7 +280,7 @@ jobs:
290280
291281
macos:
292282
name: macOS
293-
runs-on: macos-26
283+
runs-on: macos-15
294284

295285
env:
296286
CC: clang
@@ -303,15 +293,15 @@ jobs:
303293
run: sudo sed -i -e "s/localhost/localhost $(hostname)/g" /etc/hosts
304294

305295
- name: Install dependencies with Homebrew
306-
run: brew install googletest libzip nlohmann-json python-setuptools
296+
run: brew install davix googletest python-setuptools
307297

308298
- name: Clone repository
309-
uses: actions/checkout@v6
299+
uses: actions/checkout@v4
310300
with:
311301
fetch-depth: 0
312302

313303
- name: Build and Test with CTest
314-
run: ctest -VV -S test.cmake
304+
run: ctest -VV --repeat until-pass:3 -S test.cmake
315305

316306
- name: Install with CMake
317307
run: sudo cmake --install build

.github/workflows/COV.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- .github/workflows/COV.yml
1313
- 'src/**'
1414
- 'tests/**'
15-
tags-ignore:
1615
pull_request:
1716
workflow_dispatch:
1817

.github/workflows/DEB.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**.md'
1515
- 'docs/**'
1616
- 'docker/**'
17-
tags-ignore:
1817
workflow_dispatch:
1918

2019
concurrency:

.github/workflows/RPM.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- '**.md'
1515
- 'docs/**'
1616
- 'docker/**'
17-
tags-ignore:
1817
workflow_dispatch:
1918

2019
concurrency:

.github/workflows/macOS.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
push:
88
branches:
99
- macos
10-
tags-ignore:
1110
workflow_dispatch:
1211

1312
concurrency:

.github/workflows/python.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ name: Python
22

33
on:
44
push:
5+
branches:
6+
- '**'
57
paths:
68
- setup.py
79
- pyproject.toml
810
- 'python/**'
911
- .github/workflows/python.yml
10-
tags-ignore:
1112
pull_request:
1213
paths:
1314
- setup.py

0 commit comments

Comments
 (0)