From 7cd4b0a67e71d20967c93e152ba6bff913e9d3f2 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 03:56:16 +0000 Subject: [PATCH 01/27] Initial status --- .github/workflows/freebsd.yaml | 55 ++++++++++++++++++++++++++++ .github/workflows/openbsd.yaml | 66 ++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 .github/workflows/freebsd.yaml create mode 100644 .github/workflows/openbsd.yaml diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml new file mode 100644 index 00000000000..6b4808a5593 --- /dev/null +++ b/.github/workflows/freebsd.yaml @@ -0,0 +1,55 @@ +name: Staged commit - FreeBSD + +on: + push: + branches: [ "bsd-merge-tests" ] + +env: + # empty except for pull_request events + PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }} + +jobs: + freebsd-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout Sources + uses: actions/checkout@v4 + + - name: Test in FreeBSD + id: test-freebsd + uses: vmactions/freebsd-vm@v1 + with: + usesh: true + # release: "14.1" # supported: 12.4, 13.2, 13.3, 14.1 + # release: 13.3 + prepare: | + pkg update + pkg install -y \ + autoconf \ + autoconf-archive \ + automake \ + bash \ + cppunit \ + gmake \ + libltdl \ + libtool \ + libxml2 \ + m4 \ + nettle \ + pkgconf && + true + + run: | + export MAKE=gmake + export CFLAGS='-Wno-compound-token-split-by-macro' + export CC=clang + export CXX=clang++ + ./test-builds.sh --verbose --use-config-cache + + - name: Publish build logs + if: success() || failure() + uses: actions/upload-artifact@v4 + with: + name: freebsd-build-logs + path: btlayer-*.log diff --git a/.github/workflows/openbsd.yaml b/.github/workflows/openbsd.yaml new file mode 100644 index 00000000000..20f5afd3f32 --- /dev/null +++ b/.github/workflows/openbsd.yaml @@ -0,0 +1,66 @@ +name: Staged commit - OpenBSD + +on: + push: + branches: [ "bsd-merge-tests" ] + +env: + # empty except for pull_request events + PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }} + +jobs: + + openbsd: + runs-on: ubuntu-latest + if: false + + steps: + - name: Checkout Squid sources + uses: actions/checkout@v4 + + - name: Test + id: test + uses: vmactions/openbsd-vm@v1 + with: + usesh: true + prepare: | + pkg_add \ + autoconf-2.72p0 \ + automake-1.16.5 \ + bash \ + coreutils \ + cppunit \ + git \ + ggrep \ + gmake \ + libxml \ + libtool \ + m4 \ + metaauto + + mkdir $HOME/bin + ln -s /usr/local/bin/ggrep $HOME/bin/grep + ls -ld /usr/local/share/aclocal* + ls -l /usr/local/bin/auto* + + run: | + export MAKE=gmake + export pjobs="-j`gnproc`" + export AUTOMAKE_VERSION=1.16 + export amver=${AUTOMAKE_VERSION} + export ACLOCAL_AUTOMAKE_DIR="/usr/local/share/aclocal-${AUTOMAKE_VERSION}" + export ACLOCAL_PATH="/usr/local/share/aclocal:/usr/local/share/aclocal-${AUTOMAKE_VERSION}" + export AUTOCONF_VERSION=2.72 + export acver=${AUTOCONF_VERSION} + export ltver=2.4.2 + export CFLAGS='-Wno-compound-token-split-by-macro' + export LDFLAGS="-L/usr/local/lib" + export PATH="$HOME/bin:$PATH" + ./test-builds.sh --verbose --use-config-cache layer-02-maximus # TODO: test all layers + + - name: Publish build logs + if: success() || failure() + uses: actions/upload-artifact@v4 + with: + name: openbsd-build-logs + path: btlayer-*.log From 45b311fcad65ff96401fb6776f347cc0b2664784 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 04:32:34 +0000 Subject: [PATCH 02/27] Force ubuntu version --- .github/workflows/freebsd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index 6b4808a5593..d02445f8bc2 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -10,7 +10,7 @@ env: jobs: freebsd-test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout Sources From 626fa2e3ce67dfcd977dd3a6d1d8a3e8e42fd015 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 04:34:52 +0000 Subject: [PATCH 03/27] test multiple freebsd versions --- .github/workflows/freebsd.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index d02445f8bc2..88a7f6f9073 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -11,6 +11,12 @@ env: jobs: freebsd-test: runs-on: ubuntu-22.04 + matrix: + osversion: + - 14.1 + - 13.3 + - 12.4 + name: freebsd(${{ matrix.osversion }}) steps: - name: Checkout Sources @@ -21,8 +27,7 @@ jobs: uses: vmactions/freebsd-vm@v1 with: usesh: true - # release: "14.1" # supported: 12.4, 13.2, 13.3, 14.1 - # release: 13.3 + release: ${{ matrix.osversion }} prepare: | pkg update pkg install -y \ @@ -30,6 +35,7 @@ jobs: autoconf-archive \ automake \ bash \ + ccache \ cppunit \ gmake \ libltdl \ From 8a1356d43fff79e5ceb0e20cfeeb8c9b86223138 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 04:36:04 +0000 Subject: [PATCH 04/27] Speed development up: only test default layer --- .github/workflows/freebsd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index 88a7f6f9073..c5585a7fa5c 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -51,7 +51,7 @@ jobs: export CFLAGS='-Wno-compound-token-split-by-macro' export CC=clang export CXX=clang++ - ./test-builds.sh --verbose --use-config-cache + ./test-builds.sh --verbose --aggressively-use-config-cache layer-00-default #TODO: remove layer before release - name: Publish build logs if: success() || failure() From 7285e22844d704d32d276d8ce248ecda1ccf84e5 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 04:37:59 +0000 Subject: [PATCH 05/27] Fix syntax --- .github/workflows/freebsd.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index c5585a7fa5c..8df3e5851ce 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -10,12 +10,15 @@ env: jobs: freebsd-test: + strategy: + fail-fast: true + matrix: + osversion: + - 14.1 + - 13.3 + - 12.4 + runs-on: ubuntu-22.04 - matrix: - osversion: - - 14.1 - - 13.3 - - 12.4 name: freebsd(${{ matrix.osversion }}) steps: From 3a432fe6316304864ed5dbf0b7c131f7d894c187 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 04:50:26 +0000 Subject: [PATCH 06/27] FreeBSD 12.4 EOLd by the project --- .github/workflows/freebsd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index 8df3e5851ce..7ea4a4ec7b9 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -16,7 +16,6 @@ jobs: osversion: - 14.1 - 13.3 - - 12.4 runs-on: ubuntu-22.04 name: freebsd(${{ matrix.osversion }}) From 32c0a66fe26d8c0329521b4e5c57da6aca3644b0 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 4 Nov 2024 05:20:48 +0000 Subject: [PATCH 07/27] specify matrix dimenion in uploaded artifacts --- .github/workflows/freebsd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index 7ea4a4ec7b9..905da6154cd 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -59,5 +59,5 @@ jobs: if: success() || failure() uses: actions/upload-artifact@v4 with: - name: freebsd-build-logs + name: build-logs-freebsd-${{ matrix.osversion }} path: btlayer-*.log From 6979b08992b039c2e86ab477cbe2e92a4972e31a Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:01:58 +0000 Subject: [PATCH 08/27] Merge FreeBSD tests into slow.yaml --- .github/workflows/freebsd.yaml | 63 ---------------------------------- .github/workflows/slow.yaml | 52 ++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/freebsd.yaml diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml deleted file mode 100644 index 905da6154cd..00000000000 --- a/.github/workflows/freebsd.yaml +++ /dev/null @@ -1,63 +0,0 @@ -name: Staged commit - FreeBSD - -on: - push: - branches: [ "bsd-merge-tests" ] - -env: - # empty except for pull_request events - PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }} - -jobs: - freebsd-test: - strategy: - fail-fast: true - matrix: - osversion: - - 14.1 - - 13.3 - - runs-on: ubuntu-22.04 - name: freebsd(${{ matrix.osversion }}) - - steps: - - name: Checkout Sources - uses: actions/checkout@v4 - - - name: Test in FreeBSD - id: test-freebsd - uses: vmactions/freebsd-vm@v1 - with: - usesh: true - release: ${{ matrix.osversion }} - prepare: | - pkg update - pkg install -y \ - autoconf \ - autoconf-archive \ - automake \ - bash \ - ccache \ - cppunit \ - gmake \ - libltdl \ - libtool \ - libxml2 \ - m4 \ - nettle \ - pkgconf && - true - - run: | - export MAKE=gmake - export CFLAGS='-Wno-compound-token-split-by-macro' - export CC=clang - export CXX=clang++ - ./test-builds.sh --verbose --aggressively-use-config-cache layer-00-default #TODO: remove layer before release - - - name: Publish build logs - if: success() || failure() - uses: actions/upload-artifact@v4 - with: - name: build-logs-freebsd-${{ matrix.osversion }} - path: btlayer-*.log diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index f33f45d5014..fc0db33e7df 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -123,3 +123,55 @@ jobs: with: name: build-logs-macos path: btlayer-*.log + + freebsd: + strategy: + matrix: + osversion: + - 14.1 + - 13.3 + + runs-on: ubuntu-22.04 + name: freebsd(${{ matrix.osversion }}) + + steps: + - name: Checkout Sources + uses: actions/checkout@v4 + + - name: Test in FreeBSD + id: test-freebsd + uses: vmactions/freebsd-vm@v1 + with: + usesh: true + release: ${{ matrix.osversion }} + prepare: | + pkg update + pkg install -y \ + autoconf \ + autoconf-archive \ + automake \ + bash \ + ccache \ + cppunit \ + gmake \ + libltdl \ + libtool \ + libxml2 \ + m4 \ + nettle \ + pkgconf && + true + + run: | + export MAKE=gmake + export CFLAGS='-Wno-compound-token-split-by-macro' + export CC=clang + export CXX=clang++ + ./test-builds.sh + + - name: Publish build logs + if: success() || failure() + uses: actions/upload-artifact@v4 + with: + name: build-logs-freebsd-${{ matrix.osversion }} + path: btlayer-*.log From 25f2cf57bccdea7f401b46f4897d5ea0f40fb983 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:11:16 +0000 Subject: [PATCH 09/27] freebsd: add ccache --- .github/workflows/slow.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 5a1c58fc80f..e600dd2e3cb 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -149,6 +149,12 @@ jobs: - name: Checkout Sources uses: actions/checkout@v4 + - name: Setup ccache + uses: hendrikmuhs/ccache-action@v1.2.14 + with: + verbose: 2 # default 0 + key: freebsd-${{ matrix.osversion }} + - name: Test in FreeBSD id: test-freebsd uses: vmactions/freebsd-vm@v1 @@ -176,8 +182,8 @@ jobs: run: | export MAKE=gmake export CFLAGS='-Wno-compound-token-split-by-macro' - export CC=clang - export CXX=clang++ + export CC=/usr/local/bin/ccache clang + export CXX=/usr/local/bin/ccache clang++ ./test-builds.sh - name: Publish build logs From cc23c00ee5268916649be912cbbab2efadd8548d Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:19:31 +0000 Subject: [PATCH 10/27] try ccache with relative path --- .github/workflows/slow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index e600dd2e3cb..5b3f08ab2ae 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -182,8 +182,8 @@ jobs: run: | export MAKE=gmake export CFLAGS='-Wno-compound-token-split-by-macro' - export CC=/usr/local/bin/ccache clang - export CXX=/usr/local/bin/ccache clang++ + export CC=ccache clang + export CXX=ccache clang++ ./test-builds.sh - name: Publish build logs From f3f7248ee4a973e1184c93b2e949a240958cf5aa Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:20:40 +0000 Subject: [PATCH 11/27] type ccache path --- .github/workflows/slow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 5b3f08ab2ae..5184aafe29b 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -184,6 +184,7 @@ jobs: export CFLAGS='-Wno-compound-token-split-by-macro' export CC=ccache clang export CXX=ccache clang++ + echo -n "CCache location: `which ccache`" ./test-builds.sh - name: Publish build logs From 6ddd23c04e71af7fb454afe3d555252ae32260c6 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:26:04 +0000 Subject: [PATCH 12/27] quote CC and CXX definitions --- .github/workflows/slow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 5184aafe29b..d19ca1f13bf 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -182,8 +182,8 @@ jobs: run: | export MAKE=gmake export CFLAGS='-Wno-compound-token-split-by-macro' - export CC=ccache clang - export CXX=ccache clang++ + export CC="ccache clang" + export CXX="ccache clang++" echo -n "CCache location: `which ccache`" ./test-builds.sh From f6fbcaf58601239b710425afcabfd1b16e6e5d26 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:26:45 +0000 Subject: [PATCH 13/27] test setup: skip linux and macos for now --- .github/workflows/slow.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index d19ca1f13bf..61f1f1d80c5 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -21,6 +21,7 @@ concurrency: jobs: linux-distros: + if: false strategy: matrix: @@ -82,6 +83,7 @@ jobs: macos: runs-on: macos-14 name: macos + if: false steps: - name: Install prerequisite MacOS packages From 3bc138ebf377eef22e88f42e5514056b9b6f11f3 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 17 Nov 2024 22:30:03 +0000 Subject: [PATCH 14/27] Ccache is in /usr/local/bin --- .github/workflows/slow.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 61f1f1d80c5..a44ea97843a 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -184,9 +184,8 @@ jobs: run: | export MAKE=gmake export CFLAGS='-Wno-compound-token-split-by-macro' - export CC="ccache clang" - export CXX="ccache clang++" - echo -n "CCache location: `which ccache`" + export CC="/usr/local/bin/ccache clang" + export CXX="/usr/local/bin/ccache clang++" ./test-builds.sh - name: Publish build logs From 8f42e00b5daa68c70c4af8368f0d7b7a1565cddf Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 18 Nov 2024 14:18:03 +0000 Subject: [PATCH 15/27] Ready for submission --- .github/workflows/slow.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index a44ea97843a..14d5b81fae0 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -21,7 +21,6 @@ concurrency: jobs: linux-distros: - if: false strategy: matrix: @@ -83,7 +82,6 @@ jobs: macos: runs-on: macos-14 name: macos - if: false steps: - name: Install prerequisite MacOS packages From 1dcc91d4b4ddb7f8d21f00b5708c600241b69d33 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 18 Nov 2024 18:07:08 +0000 Subject: [PATCH 16/27] Remove openbsd --- .github/workflows/openbsd.yaml | 66 ---------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 .github/workflows/openbsd.yaml diff --git a/.github/workflows/openbsd.yaml b/.github/workflows/openbsd.yaml deleted file mode 100644 index 20f5afd3f32..00000000000 --- a/.github/workflows/openbsd.yaml +++ /dev/null @@ -1,66 +0,0 @@ -name: Staged commit - OpenBSD - -on: - push: - branches: [ "bsd-merge-tests" ] - -env: - # empty except for pull_request events - PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }} - -jobs: - - openbsd: - runs-on: ubuntu-latest - if: false - - steps: - - name: Checkout Squid sources - uses: actions/checkout@v4 - - - name: Test - id: test - uses: vmactions/openbsd-vm@v1 - with: - usesh: true - prepare: | - pkg_add \ - autoconf-2.72p0 \ - automake-1.16.5 \ - bash \ - coreutils \ - cppunit \ - git \ - ggrep \ - gmake \ - libxml \ - libtool \ - m4 \ - metaauto - - mkdir $HOME/bin - ln -s /usr/local/bin/ggrep $HOME/bin/grep - ls -ld /usr/local/share/aclocal* - ls -l /usr/local/bin/auto* - - run: | - export MAKE=gmake - export pjobs="-j`gnproc`" - export AUTOMAKE_VERSION=1.16 - export amver=${AUTOMAKE_VERSION} - export ACLOCAL_AUTOMAKE_DIR="/usr/local/share/aclocal-${AUTOMAKE_VERSION}" - export ACLOCAL_PATH="/usr/local/share/aclocal:/usr/local/share/aclocal-${AUTOMAKE_VERSION}" - export AUTOCONF_VERSION=2.72 - export acver=${AUTOCONF_VERSION} - export ltver=2.4.2 - export CFLAGS='-Wno-compound-token-split-by-macro' - export LDFLAGS="-L/usr/local/lib" - export PATH="$HOME/bin:$PATH" - ./test-builds.sh --verbose --use-config-cache layer-02-maximus # TODO: test all layers - - - name: Publish build logs - if: success() || failure() - uses: actions/upload-artifact@v4 - with: - name: openbsd-build-logs - path: btlayer-*.log From d1cf890ed6681867ca7f241d9affe60a232bf840 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 18 Nov 2024 19:19:07 +0000 Subject: [PATCH 17/27] avoid unnecessary command in package install --- .github/workflows/slow.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 14d5b81fae0..5b6b96c1331 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -176,8 +176,7 @@ jobs: libxml2 \ m4 \ nettle \ - pkgconf && - true + pkgconf run: | export MAKE=gmake From 40218517b853d5f2e6d5a54d12fd8c4332f0b80c Mon Sep 17 00:00:00 2001 From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:11:18 +0000 Subject: [PATCH 18/27] Adopt suggestion from code review Co-authored-by: Alex Rousskov --- .github/workflows/slow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 5b6b96c1331..2b1dfa226fc 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -155,8 +155,8 @@ jobs: verbose: 2 # default 0 key: freebsd-${{ matrix.osversion }} - - name: Test in FreeBSD - id: test-freebsd + - name: Run test-builds + id: test-builds uses: vmactions/freebsd-vm@v1 with: usesh: true From 317566fea42c605a370146a7cb3fe5680b2573bc Mon Sep 17 00:00:00 2001 From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:12:22 +0000 Subject: [PATCH 19/27] Remove libxml2, not needed for trunk Co-authored-by: Alex Rousskov --- .github/workflows/slow.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 2b1dfa226fc..efb27fbeb46 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -173,7 +173,6 @@ jobs: gmake \ libltdl \ libtool \ - libxml2 \ m4 \ nettle \ pkgconf From 8a8d8e2906b54e102eaa37546693dcbf18144f7f Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 18 Nov 2024 22:14:52 +0000 Subject: [PATCH 20/27] experiment: remove -Wno-compound-token-split-by-macro flag --- .github/workflows/slow.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index efb27fbeb46..6e1226a0b5b 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -179,7 +179,6 @@ jobs: run: | export MAKE=gmake - export CFLAGS='-Wno-compound-token-split-by-macro' export CC="/usr/local/bin/ccache clang" export CXX="/usr/local/bin/ccache clang++" ./test-builds.sh From ee91e33f10d72b1a4fea13f836a4e5c5e8b0c4bb Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 18 Nov 2024 22:45:58 +0000 Subject: [PATCH 21/27] Use workflow env directive for env variables --- .github/workflows/slow.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 6e1226a0b5b..98e264d3ffa 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -144,6 +144,10 @@ jobs: runs-on: ubuntu-22.04 name: freebsd(${{ matrix.osversion }}) + env: + CC: /usr/local/bin/ccache clang + CXX: /usr/local/bin/ccache clang++ + MAKE: gmake steps: - name: Checkout Sources @@ -178,9 +182,6 @@ jobs: pkgconf run: | - export MAKE=gmake - export CC="/usr/local/bin/ccache clang" - export CXX="/usr/local/bin/ccache clang++" ./test-builds.sh - name: Publish build logs From 30023e07dbcf55f5b480daa9b4ef86a91f53b169 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 19 Nov 2024 16:13:54 +0000 Subject: [PATCH 22/27] Environment variables are not propagated inside the VM --- .github/workflows/slow.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 98e264d3ffa..6e1226a0b5b 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -144,10 +144,6 @@ jobs: runs-on: ubuntu-22.04 name: freebsd(${{ matrix.osversion }}) - env: - CC: /usr/local/bin/ccache clang - CXX: /usr/local/bin/ccache clang++ - MAKE: gmake steps: - name: Checkout Sources @@ -182,6 +178,9 @@ jobs: pkgconf run: | + export MAKE=gmake + export CC="/usr/local/bin/ccache clang" + export CXX="/usr/local/bin/ccache clang++" ./test-builds.sh - name: Publish build logs From 5ec8fe8e0b9ae91106b422b663c9218043c4e328 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 19 Nov 2024 20:59:08 +0000 Subject: [PATCH 23/27] add translate-toolkit --- .github/workflows/slow.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 6e1226a0b5b..ab42536f365 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -175,7 +175,8 @@ jobs: libtool \ m4 \ nettle \ - pkgconf + pkgconf \ + translate-toolkit run: | export MAKE=gmake From 4593fd97fd446522c5e2d81a04962f8fc7a7aae0 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 19 Nov 2024 22:00:12 +0000 Subject: [PATCH 24/27] Specify layers to be tested --- .github/workflows/slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index ab42536f365..9a4c7c96aa3 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -182,7 +182,7 @@ jobs: export MAKE=gmake export CC="/usr/local/bin/ccache clang" export CXX="/usr/local/bin/ccache clang++" - ./test-builds.sh + ./test-builds.sh layer-00-default layer-01-minimal layer-02-maximus - name: Publish build logs if: success() || failure() From e3ab17cfb8cf914f279e1acf8786368aa3ef8673 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 19 Nov 2024 22:02:38 +0000 Subject: [PATCH 25/27] Ccache is useless inside the vm --- .github/workflows/slow.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 9a4c7c96aa3..0b951dedf48 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -149,12 +149,6 @@ jobs: - name: Checkout Sources uses: actions/checkout@v4 - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2.14 - with: - verbose: 2 # default 0 - key: freebsd-${{ matrix.osversion }} - - name: Run test-builds id: test-builds uses: vmactions/freebsd-vm@v1 @@ -168,7 +162,6 @@ jobs: autoconf-archive \ automake \ bash \ - ccache \ cppunit \ gmake \ libltdl \ @@ -180,8 +173,8 @@ jobs: run: | export MAKE=gmake - export CC="/usr/local/bin/ccache clang" - export CXX="/usr/local/bin/ccache clang++" + export CC=clang + export CXX=clang++ ./test-builds.sh layer-00-default layer-01-minimal layer-02-maximus - name: Publish build logs From c814258919a5ff938389890872e60b36c6df688b Mon Sep 17 00:00:00 2001 From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:06:23 +0000 Subject: [PATCH 26/27] revert tested layers selection Co-authored-by: Alex Rousskov --- .github/workflows/slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 0b951dedf48..2722165edf3 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -175,7 +175,7 @@ jobs: export MAKE=gmake export CC=clang export CXX=clang++ - ./test-builds.sh layer-00-default layer-01-minimal layer-02-maximus + ./test-builds.sh - name: Publish build logs if: success() || failure() From 93174c732bc0693e9611a308f5cda6c8b18fe6ae Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Wed, 20 Nov 2024 16:00:16 +0000 Subject: [PATCH 27/27] do not explicitly mention we are testing on clang --- .github/workflows/slow.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 2722165edf3..534b293543f 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -173,8 +173,6 @@ jobs: run: | export MAKE=gmake - export CC=clang - export CXX=clang++ ./test-builds.sh - name: Publish build logs