From a921c2d1ac691ef8483a484aed53ab97a32e75f5 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Dec 2024 18:19:08 +0100 Subject: [PATCH 1/4] GHA: import improvements from base configuration - update actions/checkout v3 -> v4 - use older ci-core-dumper@node16 on CentOS 7 - add workflow_dispatch trigger --- .github/workflows/ci-scripts-build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index c88285f..cd4caf3 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -19,6 +19,7 @@ on: - '.gitattributes' - '**/*.html' - '**/*.md' + workflow_dispatch: env: SETUP_PATH: .ci-local:.ci @@ -161,7 +162,7 @@ jobs: extra: "CMD_CXXFLAGS=-std=c++11" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Automatic core dumper analysis @@ -249,11 +250,15 @@ jobs: # people would rather just break all existing scripts... [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python python --version - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Automatic core dumper analysis uses: mdavidsaver/ci-core-dumper@master + if: matrix.image!='centos:7' + - name: Automatic core dumper analysis + uses: mdavidsaver/ci-core-dumper@node16 + if: matrix.image=='centos:7' - name: Prepare and compile dependencies run: python .ci/cue.py prepare - name: Build main module From 6b803c3fd0d5ffc46299eedde3f977738fa25cb8 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Dec 2024 17:42:24 +0100 Subject: [PATCH 2/4] GHA: replace CentOS-7 build by CentOS-8 - fix repo URLs on CentOS-8 (mirror->vault) - clean-up CentOS-7 exceptions (git, yum/dnf) --- .github/workflows/ci-scripts-build.yml | 35 ++++++++------------------ 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index cd4caf3..09c7f42 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -205,8 +205,8 @@ jobs: matrix: # Job names also name artifacts, character limitations apply include: - - name: "CentOS-7" - image: centos:7 + - name: "CentOS-8" + image: centos:8 cmp: gcc configuration: default extra: "CMD_CXXFLAGS=-std=c++11" @@ -224,28 +224,17 @@ jobs: extra: "CMD_CXXFLAGS=-std=c++11" steps: - - name: "Build newer Git" - # actions/checkout@v2 wants git >=2.18 - # centos:7 has 1.8 - if: matrix.image=='centos:7' + - name: "Fix repo URLs on CentOS-8" + # centos:8 is frozen, repos are in the vault + if: matrix.image=='centos:8' run: | - yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker - curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz - cd git-* - make -j2 prefix=/usr/local all - make prefix=/usr/local install - cd .. - rm -rf git-* - type -a git - git --version + sed -i -e "s|mirrorlist=|#mirrorlist=|" \ + -e "s|#baseurl=http://mirror|baseurl=http://vault|" \ + /etc/yum.repos.d/CentOS-Linux-{BaseOS,AppStream,Extras,Plus}.repo - name: "Redhat setup" run: | - dnfyum() { - dnf -y "$@" || yum -y "$@" - return $? - } - dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple - git --version || dnfyum install git + dnf -y install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple + git --version || dnf -y install git # rather than just bite the bullet and link python3 -> python, # people would rather just break all existing scripts... [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python @@ -255,10 +244,6 @@ jobs: submodules: true - name: Automatic core dumper analysis uses: mdavidsaver/ci-core-dumper@master - if: matrix.image!='centos:7' - - name: Automatic core dumper analysis - uses: mdavidsaver/ci-core-dumper@node16 - if: matrix.image=='centos:7' - name: Prepare and compile dependencies run: python .ci/cue.py prepare - name: Build main module From e97c5461a616559a16209a02a13cf3b7782d2397 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Dec 2024 17:38:11 +0100 Subject: [PATCH 3/4] GHA: add Rocky-9 build --- .github/workflows/ci-scripts-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 09c7f42..10881db 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -211,6 +211,12 @@ jobs: configuration: default extra: "CMD_CXXFLAGS=-std=c++11" + - name: "Rocky-9" + image: rockylinux:9 + cmp: gcc + configuration: default + extra: "CMD_CXXFLAGS=-std=c++11" + - name: "Fedora-33" image: fedora:33 cmp: gcc From 13994f33507fa7dfabfc1ef638844cecceac15ae Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Dec 2024 18:10:37 +0100 Subject: [PATCH 4/4] GHA: add jobs for Base-7 on Ubuntu-22 (gcc-11 and clang-14) --- .github/workflows/ci-scripts-build.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 10881db..81b1a21 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -42,6 +42,20 @@ jobs: matrix: # Job names also name artifacts, character limitations apply include: + - name: "Ub-22 gcc-11 Base 7.0" + os: ubuntu-22.04 + cmp: gcc + configuration: default + base: "7.0" + extra: "CMD_CXXFLAGS=-std=c++11" + + - name: "Ub-22 gcc-11 static Base 7.0" + os: ubuntu-22.04 + cmp: gcc + configuration: static + base: "7.0" + extra: "CMD_CXXFLAGS=-std=c++11" + - name: "Ub-20 gcc-9 Base 7.0" os: ubuntu-20.04 cmp: gcc @@ -115,6 +129,13 @@ jobs: base: "7.0" extra: "CMD_CXXFLAGS=-std=c++11" + - name: "Ub-22 clang-14" + os: ubuntu-22.04 + cmp: clang + configuration: default + base: "7.0" + extra: "CMD_CXXFLAGS=-std=c++11" + - name: "RTEMS 5" os: ubuntu-20.04 cmp: gcc