Skip to content

Commit 64bf5ef

Browse files
dreibhdreibh
committed
Updated CI configuration
1 parent b897f79 commit 64bf5ef

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

‎.github/workflows/freebsd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitHub Actions Scripts
2-
# Copyright (C) 2021-2024 by Thomas Dreibholz
2+
# Copyright (C) 2021-2025 by Thomas Dreibholz
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by

‎.github/workflows/linux.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitHub Actions Scripts
2-
# Copyright (C) 2021-2024 by Thomas Dreibholz
2+
# Copyright (C) 2021-2025 by Thomas Dreibholz
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -47,20 +47,20 @@ jobs:
4747
cxx: g++
4848

4949
# ====== Debian Linux =============================================
50-
#- label: "Debian 12 (Bookworm) with GCC"
51-
# image: debian:bookworm
52-
# cc: gcc
53-
# cxx: g++
54-
#- label: "Debian 11 (Bullseye) with GCC"
55-
# image: debian:bullseye
56-
# cc: gcc
57-
# cxx: g++
50+
- label: "Debian 12 (Bookworm) with GCC"
51+
image: debian:bookworm
52+
cc: gcc
53+
cxx: g++
54+
- label: "Debian 11 (Bullseye) with GCC"
55+
image: debian:bullseye
56+
cc: gcc
57+
cxx: g++
5858

5959
# ====== Fedora Linux =============================================
60-
#- label: "Fedora 40 with Clang"
61-
# image: fedora:40
62-
# cc: clang
63-
# cxx: clang++
60+
- label: "Fedora 40 with Clang"
61+
image: fedora:40
62+
cc: clang
63+
cxx: clang++
6464

6565

6666
# ###### Build commands #################################################

‎.github/workflows/multiarch.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitHub Actions Scripts
2-
# Copyright (C) 2021-2024 by Thomas Dreibholz
2+
# Copyright (C) 2021-2025 by Thomas Dreibholz
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -50,23 +50,23 @@ jobs:
5050
cxx: g++
5151

5252
# ====== Debian Linux =============================================
53-
#- label: "Debian 12 (Bookworm): GCC/i386"
54-
# arch: i386
55-
# distro: bookworm
56-
# cc: gcc
57-
# cxx: g++
58-
#- label: "Debian 12 (Bookworm): Clang/ARMv7"
59-
# arch: arm32v7
60-
# distro: bookworm
61-
# cc: clang
62-
# cxx: clang++
53+
- label: "Debian 12 (Bookworm): GCC/i386"
54+
arch: i386
55+
distro: bookworm
56+
cc: gcc
57+
cxx: g++
58+
- label: "Debian 12 (Bookworm): Clang/ARMv7"
59+
arch: arm32v7
60+
distro: bookworm
61+
cc: clang
62+
cxx: clang++
6363

6464
# ====== Fedora Linux =============================================
65-
#- label: "Fedora 41: GCC/PPC64"
66-
# arch: ppc64le
67-
# distro: fedora41
68-
# cc: gcc
69-
# cxx: g++
65+
- label: "Fedora 41: GCC/PPC64"
66+
arch: ppc64le
67+
distro: fedora41
68+
cc: gcc
69+
cxx: g++
7070

7171

7272
# ###### Build commands #################################################

‎.github/workflows/packaging.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitHub Actions Scripts
2-
# Copyright (C) 2021-2024 by Thomas Dreibholz
2+
# Copyright (C) 2021-2025 by Thomas Dreibholz
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -40,37 +40,37 @@ jobs:
4040
sudo ci/ci-test
4141
4242
# ====== Debian Linux =====================================================
43-
#debian-packaging:
44-
# name: Debian Packaging
45-
# runs-on: ubuntu-latest
46-
# container:
47-
# image: debian:unstable
48-
# options: --privileged
49-
# steps:
50-
# - uses: actions/checkout@v4
51-
# - name: Packaging
52-
# shell: bash
53-
# run: |
54-
# CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-setup package
55-
# CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-install package
56-
# CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-build package
57-
# # ci/ci-test <- Not running on Ubuntu!
43+
debian-packaging:
44+
name: Debian Packaging
45+
runs-on: ubuntu-latest
46+
container:
47+
image: debian:unstable
48+
options: --privileged
49+
steps:
50+
- uses: actions/checkout@v4
51+
- name: Packaging
52+
shell: bash
53+
run: |
54+
CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-setup package
55+
CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-install package
56+
CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-build package
57+
# ci/ci-test <- Not running on Ubuntu!
5858
5959
# ====== Fedora Linux =====================================================
60-
#fedora-packaging:
61-
# name: Fedora Packaging
62-
# runs-on: ubuntu-latest
63-
# container:
64-
# # Using Fedora 39 here, due to problems with Mock!
65-
# # => https://github.com/rpm-software-management/mock/issues/1487
66-
# image: fedora:39
67-
# options: --privileged --cap-add=SYS_ADMIN
68-
# steps:
69-
# - uses: actions/checkout@v4
70-
# - name: Packaging
71-
# shell: bash
72-
# run: |
73-
# CC=clang CXX=clang++ ARCH= ci/ci-setup package
74-
# CC=clang CXX=clang++ ARCH= ci/ci-install package
75-
# CC=clang CXX=clang++ ARCH= ci/ci-build package
76-
# ci/ci-test
60+
fedora-packaging:
61+
name: Fedora Packaging
62+
runs-on: ubuntu-latest
63+
container:
64+
# Using Fedora 39 here, due to problems with Mock!
65+
# => https://github.com/rpm-software-management/mock/issues/1487
66+
image: fedora:39
67+
options: --privileged --cap-add=SYS_ADMIN
68+
steps:
69+
- uses: actions/checkout@v4
70+
- name: Packaging
71+
shell: bash
72+
run: |
73+
CC=clang CXX=clang++ ARCH= ci/ci-setup package
74+
CC=clang CXX=clang++ ARCH= ci/ci-install package
75+
CC=clang CXX=clang++ ARCH= ci/ci-build package
76+
ci/ci-test

0 commit comments

Comments
 (0)