Skip to content

Commit ec3a26a

Browse files
committed
Try to fix CI.
It's been quite a few years, and the CI is no longer working here. We need to do lots of little fixes to make things build again. Since then... * centos' mirrorlist has gone away entirely. * Prince 15.4.1 is now the latest 15.x version. * GitHub no longer supports running on Ubuntu 20.04. * 24.04 is now available for testing, we've dropped 18.04. * Linux Mint 22 is now available (dropping 18) * Debian 12 tested (10 no longer supported).
1 parent 50fa99e commit ec3a26a

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
jobs:
1919
test-examples:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
2121
container: ubuntu:20.04
2222
steps:
2323
- uses: actions/checkout@v3
@@ -38,10 +38,10 @@ jobs:
3838

3939
# Tests for different platforms
4040
test-platforms:
41-
runs-on: ubuntu-20.04
41+
runs-on: ubuntu-24.04
4242
strategy:
4343
matrix:
44-
os: ["ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "centos:7", "centos:8", "debian:10", "linuxmintd/mint18-amd64", "linuxmintd/mint20-amd64"]
44+
os: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "centos:7", "centos:8", "debian:12", "linuxmintd/mint20-amd64", "linuxmintd/mint22-amd64"]
4545
#os: ["ubuntu:18.04"]
4646
container: ${{ matrix.os }}
4747
needs: test-examples # always run after the baseline tests
@@ -55,13 +55,20 @@ jobs:
5555
for i in /etc/yum.repos.d/* ; do sed -i 's/mirrorlist/#mirrorlist/' $i ; done
5656
for i in /etc/yum.repos.d/* ; do sed -i 's!#baseurl=http://mirror.!baseurl=http://vault.!' $i ; done
5757
58+
- name: Prerequisites for CentOS 7
59+
if: matrix.os == 'centos:7'
60+
run: |
61+
sed -i 's/mirror\.centos\.org/vault.centos.org/g' /etc/yum.repos.d/CentOS-*.repo
62+
sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/CentOS-*.repo
63+
sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/CentOS-*.repo
64+
5865
- name: Build examples
5966
run: |
6067
crosscompile/build-examples.sh
6168
6269
test-riscos:
6370
# The type of runner that the job will run on
64-
runs-on: ubuntu-20.04
71+
runs-on: ubuntu-24.04
6572
needs: test-examples # always run after the baseline tests
6673

6774
# Steps represent a sequence of tasks that will be executed as part of the job
@@ -93,7 +100,7 @@ jobs:
93100
# If it didn't report an error, the test was successful.
94101
95102
export-posix:
96-
runs-on: ubuntu-20.04
103+
runs-on: ubuntu-24.04
97104
needs: ["test-riscos", "test-platforms"]
98105
steps:
99106
- uses: actions/checkout@v3
@@ -119,7 +126,7 @@ jobs:
119126

120127
export-riscos:
121128
# The type of runner that the job will run on
122-
runs-on: ubuntu-20.04
129+
runs-on: ubuntu-24.04
123130
needs: ["test-riscos", "test-platforms"]
124131

125132
outputs:

.gitlab-ci.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ test-examples:
4545

4646

4747
# A collection of tests for different platforms
48-
p:ubuntu-18.04:
49-
image: ubuntu:18.04
48+
p:ubuntu-20.04:
49+
image: ubuntu:20.04
5050
stage: platforms
5151
needs: ['test-examples']
5252
script:
5353
- crosscompile/build-examples.sh
5454
tags:
5555
- linux
5656

57-
p:ubuntu-20.04:
58-
image: ubuntu:20.04
57+
p:ubuntu-22.04:
58+
image: ubuntu:22.04
5959
stage: platforms
6060
needs: ['test-examples']
6161
script:
6262
- crosscompile/build-examples.sh
6363
tags:
6464
- linux
6565

66-
p:ubuntu-22.04:
67-
image: ubuntu:22.04
66+
p:ubuntu-24.04:
67+
image: ubuntu:24.04
6868
stage: platforms
6969
needs: ['test-examples']
7070
script:
@@ -77,6 +77,9 @@ p:centos-7:
7777
stage: platforms
7878
needs: ['test-examples']
7979
script:
80+
- sed -i 's/mirror\.centos\.org/vault.centos.org/g' /etc/yum.repos.d/CentOS-*.repo
81+
- sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/CentOS-*.repo
82+
- sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/CentOS-*.repo
8083
- crosscompile/build-examples.sh
8184
tags:
8285
- linux
@@ -94,20 +97,12 @@ p:centos-8:
9497
tags:
9598
- linux
9699

97-
p:debian-10:
98-
image: debian:10
99-
stage: platforms
100-
needs: ['test-examples']
101-
script:
102-
- crosscompile/build-examples.sh
103-
tags:
104-
- linux
105-
106-
p:mint-18:
107-
image: linuxmintd/mint18-amd64
100+
p:debian-12:
101+
image: debian:12
108102
stage: platforms
109103
needs: ['test-examples']
110104
script:
105+
- apt-get update
111106
- crosscompile/build-examples.sh
112107
tags:
113108
- linux
@@ -121,8 +116,8 @@ p:mint-20:
121116
tags:
122117
- linux
123118

124-
p:mint-21:
125-
image: linuxmintd/mint20-amd64
119+
p:mint-22:
120+
image: linuxmintd/mint22-amd64
126121
stage: platforms
127122
needs: ['test-examples']
128123
script:

crosscompile/build-examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
set -e
3030
set -o pipefail
3131

32-
PRINCE_VERSION=15.1
32+
PRINCE_VERSION=15.4.1
3333
SYSTEM="$(uname -s)"
3434

3535
if [[ "$SYSTEM" = 'Darwin' ]] ; then

0 commit comments

Comments
 (0)