Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable macos 86/arm release #2590

Merged
merged 12 commits into from
May 31, 2024
Merged

enable macos 86/arm release #2590

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d61bca4
responding to comments from mmhat to enable macos 86/arm release
winitzki May 31, 2024
60bb1ad
wip
winitzki May 31, 2024
758c176
wip
winitzki May 31, 2024
d744bd3
disable build
winitzki May 31, 2024
205a082
Update .github/workflows/main.yml
winitzki May 31, 2024
6d89b02
Update .github/workflows/main.yml
winitzki May 31, 2024
f14de98
Update .github/workflows/main.yml
winitzki May 31, 2024
03dc7f9
Update .github/workflows/main.yml
winitzki May 31, 2024
3e20f67
Update .github/workflows/main.yml
winitzki May 31, 2024
d6226cf
Update .mergify.yml
winitzki May 31, 2024
a401767
enable build
winitzki May 31, 2024
89b959f
Merge branch 'main' into feature/publish-macos-builds
winitzki May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
- name: "Cache"
uses: actions/cache@v3
with:
key: ${{ matrix.os.runner }}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }}
key: ${{ matrix.os.runner }}-${{ runner.arch }}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }}
restore-keys: |
${{ matrix.os.runner }}-
${{ matrix.os.runner }}-${{ runner.arch }}-
path: |
${{ steps.setup-haskell-cabal.outputs.stack-root }}
- name: Install libsodium
Expand Down Expand Up @@ -131,14 +131,12 @@ jobs:
dhall-yaml
)

architecture="$(uname -m)"

function package() (
local package="${1}"
local version="$(stack query locals "${package}" version)"
shift
local assets=("${@}")
local package_file="${package}-${version}-${architecture}-${{runner.os}}.${{ matrix.os.file-extension }}"
local package_file="${package}-${version}-${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}"
${{matrix.os.archive-command}} "${package_file}" "${assets[@]}"
)

Expand All @@ -159,5 +157,5 @@ jobs:
if: ${{ matrix.stack-yaml == 'stack.yaml' }}
uses: actions/upload-artifact@v3
with:
name: 'dhall-${{runner.os}}.${{matrix.os.file-extension}}'
path: 'dhall-*${{runner.os}}.${{matrix.os.file-extension}}'
name: 'dhall-${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'
path: 'dhall-*${{ runner.os }}-${{ runner.arch }}.${{ matrix.os.file-extension }}'
Loading