Merge branch 'freebsd'

.cirrus.yml

@@ -1,28 +0,0 @@
-freebsd_instance:
-  image_family: freebsd-13-2
-
-build_task:
-  name: build
-  env:
-    GHC_VER: 9.4.8
-    CABAL_VER: 3.10.2.0
-    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    ARCH: 64
-    RUNNER_OS: FreeBSD
-    DISTRO: na
-    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
-    JSON_VERSION: "0.0.7"
-    CIRRUS_CLONE_SUBMODULES: true
-    AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc]
-    AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7]
-    S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d]
-  install_script:
-    - sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
-    - pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
-  script:
-    - tzsetup Etc/GMT
-    - adjkerntz -a
-    - bash .github/scripts/build.sh
-    - bash .github/scripts/test.sh
-  binaries_artifacts:
-    path: "out/*"

.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"
 

.github/workflows/cross.yaml

@@ -19,7 +19,7 @@ env:
 jobs:
   build:
     name: Build linux binary
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64, maerwald]
     env:
       CABAL_VER: 3.10.1.0
       JSON_VERSION: "0.0.7"

.github/workflows/release.yaml

@@ -94,21 +94,15 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "armv7-linux-ghcup"
             GHC_VER: 9.2.8
             ARCH: ARM
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
             GHC_VER: 9.4.8
             ARCH: ARM64
     steps:
-      - uses: docker://arm64v8/debian:10
-        name: Cleanup (aarch64 linux)
-        continue-on-error: true
-        with:
-          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
-
       - name: git config
         run: |
           git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
@@ -247,6 +241,42 @@ jobs:
           path: |
             ./out/*
 
+  build-freebsd:
+    name: Build binary (FreeBSD)
+    runs-on: [self-hosted, FreeBSD, X64]
+    env:
+      CABAL_VER: 3.10.2.0
+      MACOSX_DEPLOYMENT_TARGET: 10.13
+      JSON_VERSION: "0.0.8"
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      S3_HOST: ${{ secrets.S3_HOST }}
+      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'
+
+      - name: Run build
+        run: |
+          sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
+          pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 libiconv
+          tzsetup Etc/GMT
+          adjkerntz -a
+          bash .github/scripts/build.sh
+      - if: always()
+        name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifacts
+          path: |
+            ./out/*
+
   test-linux:
     name: Test linux
     needs: "build-linux"
@@ -335,24 +365,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "armv7-linux-ghcup"
             GHC_VER: 9.2.8
             ARCH: ARM
             DISTRO: Ubuntu
-          - os: [self-hosted, Linux, ARM64]
+          - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
             GHC_VER: 9.4.8
             ARCH: ARM64
             DISTRO: Ubuntu
 
     steps:
-      - uses: docker://arm64v8/debian:10
-        name: Cleanup (aarch64 linux)
-        continue-on-error: true
-        with:
-          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
-
       - name: Checkout code
         uses: actions/checkout@v3
         with:
@@ -469,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
@@ -502,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: