Skip to content

Commit

Permalink
Merge branch 'ci93' into wip/0.1.40.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hasufell committed Jan 1, 2025
2 parents 2f92839 + 54e171f commit 02db7eb
Showing 1 changed file with 11 additions and 29 deletions.
40 changes: 11 additions & 29 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Build linux binary
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down Expand Up @@ -85,13 +85,12 @@ jobs:
name: Build ARM binary
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
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 }}
strategy:
fail-fast: true
matrix:
include:
- os: [self-hosted, Linux, ARM64, maerwald]
Expand All @@ -101,11 +100,6 @@ jobs:
DISTRO: Debian
- os: [self-hosted, Linux, ARM64, maerwald]
ARTIFACT: "aarch64-linux-ghcup"
GHC_VER: 9.6.6
ARCH: ARM64
DISTRO: Debian
- os: [self-hosted, Linux, ARM64, maerwald]
ARTIFACT: "aarch64-linux-alpine-ghcup"
GHC_VER: 9.8.4
ARCH: ARM64
DISTRO: Alpine
Expand All @@ -125,6 +119,7 @@ jobs:
name: Run build (armv7 linux)
with:
args: sh .github/scripts/build.sh
network: host
env:
ARTIFACT: ${{ matrix.ARTIFACT }}
ARCH: ${{ matrix.ARCH }}
Expand All @@ -135,25 +130,12 @@ jobs:
S3_HOST: ${{ env.S3_HOST }}
LD: ld.gold

- if: matrix.ARCH == 'ARM64' && matrix.DISTRO == 'Debian'
uses: docker://hasufell/arm64v8-debian-haskell:10
name: Run build (aarch64 linux)
with:
args: sh .github/scripts/build.sh
env:
ARTIFACT: ${{ matrix.ARTIFACT }}
ARCH: ${{ matrix.ARCH }}
GHC_VER: ${{ matrix.GHC_VER }}
DISTRO: ${{ matrix.DISTRO }}
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
S3_HOST: ${{ env.S3_HOST }}

- if: matrix.ARCH == 'ARM64' && matrix.DISTRO == 'Alpine'
- if: matrix.ARCH == 'ARM64'
uses: docker://hasufell/arm64v8-alpine-haskell:3.20
name: Run build (aarch64 linux)
with:
args: sh -c ".github/scripts/build.sh '--ghc-options=-split-sections' '--enable-executable-static'"
network: host
env:
ARTIFACT: ${{ matrix.ARTIFACT }}
ARCH: ${{ matrix.ARCH }}
Expand All @@ -175,7 +157,7 @@ jobs:
name: Build binary (Mac/Win)
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -266,7 +248,7 @@ jobs:
name: Build binary (FreeBSD)
runs-on: [self-hosted, FreeBSD, X64]
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -309,7 +291,7 @@ jobs:
needs: "build-linux"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
JSON_VERSION: "0.0.8"
strategy:
matrix:
Expand Down Expand Up @@ -387,7 +369,7 @@ jobs:
needs: "build-arm"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
JSON_VERSION: "0.0.8"
strategy:
matrix:
Expand Down Expand Up @@ -466,7 +448,7 @@ jobs:
needs: "build-macwin"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
strategy:
Expand Down Expand Up @@ -545,7 +527,7 @@ jobs:
needs: "build-freebsd"
runs-on: [self-hosted, FreeBSD, X64]
env:
CABAL_VER: 3.10.3.0
CABAL_VER: 3.12.1.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
Expand Down

0 comments on commit 02db7eb

Please sign in to comment.