diff --git a/.github/workflows/vm2-ci.yml b/.github/workflows/vm2-ci.yml index 043d337518..78c27e4fc9 100644 --- a/.github/workflows/vm2-ci.yml +++ b/.github/workflows/vm2-ci.yml @@ -27,8 +27,6 @@ jobs: exclude: - os: {name: omnios} compiler: clang - # vmactions/solaris-vm works but is very slow to install gcc. Disable it for now - - os: {name: solaris} - os: {name: solaris} compiler: clang @@ -73,7 +71,6 @@ jobs: /opt/csw/bin/pkgutil -U /opt/csw/bin/pkgutil -y -i \ ccache \ - gcc5core \ gmake \ libcurl_dev \ libssl_dev @@ -185,6 +182,7 @@ jobs: if: matrix.os.name == 'solaris' uses: vmactions/solaris-vm@v1 with: + release: "11.4-gcc" usesh: true mem: 4096 prepare: | diff --git a/ChangeLog.txt b/ChangeLog.txt index f111b9c49c..27c6195519 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,10 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2025-01-24 07:02 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * .github/workflows/vm2-ci.yml + * reenabled solaris build with release 11.4-gcc + 2025-01-23 17:45 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbdate.h * src/common/hbdate.c