Skip to content

Commit 8c25ec4

Browse files
authored
Merge pull request #5849 from commercialhaskell/aarch64-build
Combine ARM64 workflow with integration-tests.yml
2 parents 023feea + b8329e5 commit 8c25ec4

File tree

2 files changed

+30
-35
lines changed

2 files changed

+30
-35
lines changed

.github/workflows/arm64-release.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/integration-tests.yml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,33 @@ jobs:
9595
name: ${{ runner.os }}
9696
path: _release/stack-*
9797

98+
linux-arm64:
99+
name: Linux ARM64
100+
runs-on: [self-hosted, linux, ARM64]
101+
steps:
102+
- name: Clone project
103+
uses: actions/checkout@v3
104+
105+
- name: Build bindist
106+
shell: bash
107+
run: |
108+
set -ex
109+
docker build . -f etc/dockerfiles/arm64.Dockerfile -t stack --build-arg USERID=$(id -u) --build-arg GROUPID=$(id -g)
110+
rm -rf _release
111+
mkdir -p _release
112+
docker run --rm -v $(pwd):/src -w /src stack bash -c "/home/stack/release build"
113+
114+
- name: Upload bindist
115+
uses: actions/upload-artifact@v3
116+
with:
117+
name: Linux-ARM64
118+
path: _release/stack-*
119+
98120
github-release:
99121
name: Create Github release
100-
needs: integration-tests
122+
needs:
123+
- integration-tests
124+
- linux-arm64
101125
runs-on: ubuntu-latest
102126
if: startsWith(github.ref, 'refs/tags/')
103127
steps:
@@ -116,6 +140,11 @@ jobs:
116140
with:
117141
name: Windows
118142
path: _release
143+
- name: Download Linux-ARM64 artifact
144+
uses: actions/download-artifact@v3
145+
with:
146+
name: Linux-ARM64
147+
path: _release
119148
- name: Hash and sign assets
120149
shell: bash
121150
env:

0 commit comments

Comments
 (0)