Skip to content

Commit

Permalink
Merge branch 'main' into improve-map-traverseWithKey-performance
Browse files Browse the repository at this point in the history
  • Loading branch information
winitzki authored Jun 3, 2024
2 parents adaa007 + 3b47381 commit 4ebc8bb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
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 }}'
2 changes: 1 addition & 1 deletion dhall/dhall.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Common common
contravariant < 1.6 ,
data-fix < 0.4 ,
deepseq < 1.6 ,
Diff >= 0.2 && < 0.5 ,
Diff >= 0.2 && < 0.6 ,
directory >= 1.3.0.0 && < 1.4 ,
dotgen >= 0.4.2 && < 0.5 ,
either >= 5 && < 5.1,
Expand Down

0 comments on commit 4ebc8bb

Please sign in to comment.