Skip to content

Commit 85009a8

Browse files
authored
Merge pull request #129 from CESNET/ci-fixes
fix ci issues - upgrade EOL image versions
2 parents b8e8560 + 3bae3ab commit 85009a8

3 files changed

Lines changed: 23 additions & 4 deletions

File tree

.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
name: Build and run tests on FreeBSD
1616
steps:
1717
- uses: actions/checkout@v4
18-
- name: Build on FreeBSD 14.2
18+
- name: Build on FreeBSD 14.3
1919
uses: vmactions/freebsd-vm@v1
2020
with:
21-
release: "14.2"
21+
release: "14.3"
2222
usesh: true
2323
run: |
2424
set -euox pipefail

.github/workflows/main.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ jobs:
1818
image:
1919
- 'ubuntu:20.04'
2020
- 'ubuntu:22.04'
21-
- 'debian:buster'
21+
- 'ubuntu:24.04'
2222
- 'debian:bullseye'
2323
- 'debian:bookworm'
2424
- 'rockylinux:8'
2525
- 'oraclelinux:8'
2626
- 'oraclelinux:9'
27+
- 'oraclelinux:10'
2728

2829
name: Build on ${{ matrix.image }}
2930
container: ${{ matrix.image }}
@@ -54,6 +55,11 @@ jobs:
5455
run: |
5556
dnf -y install 'dnf-command(config-manager)'
5657
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
58+
- name: Enable additional repositories (Oracle Linux 10)
59+
if: contains(matrix.image, 'oraclelinux:10')
60+
run: |
61+
dnf -y install 'dnf-command(config-manager)'
62+
dnf config-manager --set-enabled ol10_appstream ol10_codeready_builder
5763
- name: Enable EPEL (Rocky Linux)
5864
if: contains(matrix.image, 'rockylinux')
5965
run: |
@@ -66,6 +72,10 @@ jobs:
6672
if: contains(matrix.image, 'oraclelinux:9')
6773
run: |
6874
dnf -y install oracle-epel-release-el9
75+
- name: Enable EPEL (Oracle Linux 10)
76+
if: contains(matrix.image, 'oraclelinux:10')
77+
run: |
78+
dnf -y install oracle-epel-release-el10
6979
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
7080
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
7181
run: |

.github/workflows/packages.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
image: ['ubuntu:20.04', 'ubuntu:22.04', 'debian:buster', 'debian:bullseye', 'debian:bookworm']
19+
image: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:24.04', 'debian:bullseye', 'debian:bookworm']
2020

2121
name: Build DEBs on ${{ matrix.image }}
2222
container: ${{ matrix.image }}
@@ -128,6 +128,11 @@ jobs:
128128
run: |
129129
dnf -y install 'dnf-command(config-manager)'
130130
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
131+
- name: Enable additional repositories (Oracle Linux 10)
132+
if: contains(matrix.image, 'oraclelinux:10')
133+
run: |
134+
dnf -y install 'dnf-command(config-manager)'
135+
dnf config-manager --set-enabled ol10_appstream ol10_codeready_builder
131136
- name: Enable EPEL (Rocky Linux)
132137
if: contains(matrix.image, 'Rocky Linux')
133138
run: |
@@ -140,6 +145,10 @@ jobs:
140145
if: contains(matrix.image, 'oraclelinux:9')
141146
run: |
142147
dnf -y install oracle-epel-release-el9
148+
- name: Enable EPEL (Oracle Linux 10)
149+
if: contains(matrix.image, 'oraclelinux:10')
150+
run: |
151+
dnf -y install oracle-epel-release-el10
143152
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
144153
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
145154
run: |

0 commit comments

Comments
 (0)