Finalize FreeBSD CI

haskell · Feb 2, 2024 · 2bfca37 · 2bfca37
1 parent 0f7f534
commit 2bfca37
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 29 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
diff --git a/.github/scripts/env.sh b/.github/scripts/env.sh
@@ -9,6 +9,10 @@ fi
 export DEBIAN_FRONTEND=noninteractive
 export TZ=Asia/Singapore
 
+if [ "${RUNNER_OS}" = "freebsd" ] ; then
+    export RUNNER_OS=FreeBSD
+fi
+
 export OS="$RUNNER_OS"
 export PATH="$HOME/.local/bin:$PATH"
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -493,6 +493,41 @@ jobs:
           name: testfiles
           path: |
             ./test/ghcup-test/golden/unix/GHCupInfo*json
+  test-freebsd:
+    name: Test FreeBSD
+    needs: "build-freebsd"
+    runs-on: [self-hosted, FreeBSD, X64]
+    env:
+      CABAL_VER: 3.10.2.0
+      MACOSX_DEPLOYMENT_TARGET: 10.13
+      JSON_VERSION: "0.0.8"
+      ARTIFACT: "x86_64-portbld-freebsd-ghcup"
+      GHC_VER: 9.4.8
+      ARCH: 64
+      DISTRO: na
+      RUNNER_OS: FreeBSD
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifacts
+          path: ./out
+
+      - name: Run test
+        run: |
+          bash .github/scripts/test.sh
+
+      - if: failure()
+        name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: testfiles
+          path: |
+            ./test/ghcup-test/golden/unix/GHCupInfo*json
   hls:
     name: hls
     needs: build-linux
@@ -526,7 +561,7 @@ jobs:
 
   release:
     name: release
-    needs: ["test-linux", "test-arm", "test-macwin", "hls"]
+    needs: ["test-linux", "test-arm", "test-macwin", "test-freebsd", "hls"]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v')
     steps: