From 89e0ac39edfd67185feb2a5b14dd00d1d0791b7b Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 3 Jul 2024 15:32:43 +0200 Subject: [PATCH 1/7] Bump alibuild to 1.17.7 on centos&ubuntu repos This version has been available for a while and seems stable. The most notable change is managing the git repos with --filter=tree:0, which should mean a notably smaller sw/ folder size --- .github/workflows/o2-full-deps.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 1e598435..b98a07fc 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -27,16 +27,16 @@ jobs: include: - el_version: el7 container: centos:7 - alibuild_tag: v1.16.1 + alibuild_tag: v1.17.7 - el_version: el8 container: almalinux:8 - alibuild_tag: v1.16.1 + alibuild_tag: v1.17.7 - el_version: el9 container: almalinux:9 - alibuild_tag: v1.16.1 + alibuild_tag: v1.17.7 - el_version: fedora container: fedora:33 - alibuild_tag: v1.16.1 + alibuild_tag: v1.17.7 name: RPM (${{ matrix.el_version }}) container: ${{ matrix.container }} @@ -92,11 +92,12 @@ jobs: - focal # 20.04 - jammy # 22.04 - mantic # 23.10 + - noble # 24.04 name: DEB (${{ matrix.ubuntu_codename }}) container: ubuntu:${{ matrix.ubuntu_codename }} env: - ALIBUILD_TAG: v1.16.1 + ALIBUILD_TAG: v1.17.7 ALIBUILD_DISTRO: ${{ matrix.ubuntu_codename }} DEBIAN_FRONTEND: noninteractive From e7eec0b6fe6714442de9ac390814c94b646ea78c Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 3 Jul 2024 15:42:00 +0200 Subject: [PATCH 2/7] Make actionlint happy --- .github/workflows/o2-full-deps.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index b98a07fc..9127769a 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -64,14 +64,14 @@ jobs: set -x rpmbuild -ba "rpms/o2-prereq-$DISTRO.spec" git clone -b "$ALIBUILD_TAG" https://github.com/alisw/alibuild - cd alibuild + cd alibuild || exit case "$DISTRO" in el7) deps=python3,git,python3-PyYAML,python3-requests,python3-distro ;; *) deps=python3,git,python3-pyyaml,python3-requests,python3-distro ;; esac python3 setup.py bdist_rpm --requires "$deps" - cp dist/alibuild-*.noarch.rpm ~/rpmbuild/RPMS/$(uname -m)/ - cd ~/rpmbuild/RPMS/$(uname -m)/ + cp dist/alibuild-*.noarch.rpm ~/rpmbuild/RPMS/"$(uname -m)"/ + cd ~/rpmbuild/RPMS/"$(uname -m)"/ || exit createrepo . ls -la case "$DISTRO" in From 58a1d19ca00b917905f927236e3a5e6e3d24a2eb Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 3 Jul 2024 17:16:49 +0200 Subject: [PATCH 3/7] Build with fedora 40 instead --- .github/workflows/o2-full-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 9127769a..cfce1352 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -35,7 +35,7 @@ jobs: container: almalinux:9 alibuild_tag: v1.17.7 - el_version: fedora - container: fedora:33 + container: fedora:40 alibuild_tag: v1.17.7 name: RPM (${{ matrix.el_version }}) From 713bdc8ed8c421b574ad0fbda78c0bb392da322e Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 4 Jul 2024 09:23:41 +0200 Subject: [PATCH 4/7] Use bash set -e instead --- .github/workflows/o2-full-deps.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index cfce1352..2fccf4bf 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -50,7 +50,7 @@ jobs: - name: Install prerequisites run: | - set -x + set -ex yum clean all yum update -y yum install -y rpm-build scl-utils-build createrepo unzip git python3 python3-pip python3-setuptools @@ -61,17 +61,17 @@ jobs: - name: Build the ${{ matrix.el_version }} RPM and create a yum repo run: | - set -x + set -ex rpmbuild -ba "rpms/o2-prereq-$DISTRO.spec" git clone -b "$ALIBUILD_TAG" https://github.com/alisw/alibuild - cd alibuild || exit + cd alibuild case "$DISTRO" in el7) deps=python3,git,python3-PyYAML,python3-requests,python3-distro ;; *) deps=python3,git,python3-pyyaml,python3-requests,python3-distro ;; esac python3 setup.py bdist_rpm --requires "$deps" cp dist/alibuild-*.noarch.rpm ~/rpmbuild/RPMS/"$(uname -m)"/ - cd ~/rpmbuild/RPMS/"$(uname -m)"/ || exit + cd ~/rpmbuild/RPMS/"$(uname -m)"/ createrepo . ls -la case "$DISTRO" in From 99d1ba497dc92dbdc31b800554ce1e64d30c06da Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 4 Jul 2024 12:32:53 +0200 Subject: [PATCH 5/7] Fix mirrorlist for CentOS 7 --- .github/workflows/o2-full-deps.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 2fccf4bf..0e34795d 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -51,6 +51,13 @@ jobs: - name: Install prerequisites run: | set -ex + if [[ "$DISTRO" == "el7" ]]; then + sed -i.bak -e 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* + sed -i.bak -r -e 's|# ?baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + find /etc/yum.repos.d -name "*.bak" -delete + yum clean all + yum update -y + fi yum clean all yum update -y yum install -y rpm-build scl-utils-build createrepo unzip git python3 python3-pip python3-setuptools From 60c2122887f70389ac86ad4f94ea9741e9d3a0c1 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 4 Jul 2024 12:45:46 +0200 Subject: [PATCH 6/7] Node 20 GH actions fix --- .github/workflows/o2-full-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 0e34795d..506c3ce7 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -43,11 +43,11 @@ jobs: env: ALIBUILD_TAG: ${{ matrix.alibuild_tag }} DISTRO: ${{ matrix.el_version }} + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' steps: # For rpms/*.spec - uses: actions/checkout@v3 - - name: Install prerequisites run: | set -ex From 679208dd15114416c366186e391856bd6982e5a9 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 4 Jul 2024 13:54:48 +0200 Subject: [PATCH 7/7] Add note to workaround --- .github/workflows/o2-full-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 506c3ce7..a99754e8 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -43,7 +43,7 @@ jobs: env: ALIBUILD_TAG: ${{ matrix.alibuild_tag }} DISTRO: ${{ matrix.el_version }} - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true' # Only required for CentOS 7 steps: # For rpms/*.spec