From 77f1dbb7887443af6c3a20742bc1f76fdee8801f Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Fri, 15 Dec 2023 15:16:02 +1100 Subject: [PATCH 1/3] ci: reenable and clean up solaris workflow --- .github/workflows/solaris.yml | 31 ++++++++++++++++++++++++++++++ .github/workflows/solaris_test.yml | 28 --------------------------- 2 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/solaris.yml delete mode 100644 .github/workflows/solaris_test.yml diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml new file mode 100644 index 0000000000..415ff1fd89 --- /dev/null +++ b/.github/workflows/solaris.yml @@ -0,0 +1,31 @@ +# GitHub Actions workflow to run tests on a Solaris VM. +name: "Solaris" + +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * *" # At 00:00 daily. + +jobs: + test: + name: "Solaris" + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: "Checkout repository" + uses: actions/checkout@v4 + + - name: "Setup" + run: | + apt-get install automake autoconf libtool + ./autogen.sh + + - name: "Build on VM" + uses: vmactions/solaris-vm@v1 + with: + prepare: | + pkg install gcc make + run: | + MAKE=gmake ./configure + gmake -j2 check || (cat tests/test-suite.log && exit 1) diff --git a/.github/workflows/solaris_test.yml b/.github/workflows/solaris_test.yml deleted file mode 100644 index 6470278ba8..0000000000 --- a/.github/workflows/solaris_test.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: solaris_ci - -on: - workflow_dispatch: - -jobs: - build-native: - strategy: - matrix: - release: [11.4] - runs-on: ubuntu-latest - continue-on-error: false - name: Solaris ${{ matrix.release }} - steps: - - name: Checkout source - uses: actions/checkout@main - - name: Configure source - run: | - brew install automake autoconf libtool - ./autogen.sh - - name: Build on VM - uses: vmactions/solaris-vm@v1 - with: - prepare: | - pkg install gcc make - run: | - MAKE=gmake ./configure - gmake -j2 check || (cat tests/test-suite.log && exit 1) From 06fbf277e4536eddcf4eb61d9ae190b2a2a6634d Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Fri, 15 Dec 2023 16:25:26 +1100 Subject: [PATCH 2/3] ci: fix apt commands in solaris workflow --- .github/workflows/solaris.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml index 415ff1fd89..2c6ee49ad4 100644 --- a/.github/workflows/solaris.yml +++ b/.github/workflows/solaris.yml @@ -18,7 +18,8 @@ jobs: - name: "Setup" run: | - apt-get install automake autoconf libtool + sudo apt-get update + sudo apt-get install -y automake autoconf libtool ./autogen.sh - name: "Build on VM" From 276e5767f0e681ce880759f96647cf519f362a96 Mon Sep 17 00:00:00 2001 From: Joshua Sing Date: Fri, 15 Dec 2023 17:04:56 +1100 Subject: [PATCH 3/3] Add Solaris workflow badge to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 009efd5016..c623fe99bb 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux.yml) [![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos.yml) [![Android Build Status](https://github.com/libressl/portable/actions/workflows/android.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android.yml) +[![Solaris Build Status](https://github.com/libressl/portable/actions/workflows/solaris.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/solaris.yml) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl) LibreSSL is a fork of [OpenSSL](https://www.openssl.org) 1.0.1g developed by the