From 1ba2361fea9e8c46962877be7f35e58649fd8143 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 2 May 2023 19:01:40 +0800 Subject: [PATCH] Fix ARMv7 build --- .cirrus.yml | 6 ++++-- .github/workflows/release.yaml | 8 ++++---- data/metadata | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ad488b9..993da12 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image_family: freebsd-13-1 + image_family: freebsd-13-2 build_task: name: build @@ -16,7 +16,9 @@ build_task: AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc] AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7] S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d] - install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 + 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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8cfde8e..a580482 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -81,7 +81,7 @@ jobs: name: Build ARM binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.8.1.0 + CABAL_VER: 3.6.2.0 JSON_VERSION: "0.0.7" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -90,7 +90,7 @@ jobs: fail-fast: true matrix: include: - - os: [self-hosted, Linux, ARM64, aarch32-linux] + - os: [self-hosted, Linux, ARM64] ARTIFACT: "armv7-linux-ghcup" GHC_VER: 9.2.2 ARCH: ARM @@ -325,12 +325,12 @@ jobs: needs: "build-arm" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.8.1.0 + CABAL_VER: 3.6.2.0 JSON_VERSION: "0.0.7" strategy: matrix: include: - - os: [self-hosted, Linux, ARM64, aarch32-linux] + - os: [self-hosted, Linux, ARM64] ARTIFACT: "armv7-linux-ghcup" GHC_VER: 9.2.2 ARCH: ARM diff --git a/data/metadata b/data/metadata index 0b98de0..92efb73 160000 --- a/data/metadata +++ b/data/metadata @@ -1 +1 @@ -Subproject commit 0b98de04cce150d70ef74a733513759e95577769 +Subproject commit 92efb732aceec87089327201c48f65f6158ed3d8