Land #975

3 files changed, 33 insertions, 28 deletions

diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml
new file mode 100644
index 0000000..2c6ee49
--- /dev/null
+++ b/.github/workflows/solaris.yml
@@ -0,0 +1,32 @@
+# 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: |
+          sudo apt-get update
+          sudo apt-get install -y 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 6470278..0000000
--- 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)
diff --git a/README.md b/README.md
index 009efd5..c623fe9 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