Skip to content

fixing the MacOS build #2586

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

Merged
winitzki merged 23 commits into from
May 31, 2024
Merged

fixing the MacOS build #2586

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
178ea96
no-op change just to test the build
winitzki May 12, 2024
ada55e1
wip add explicit homebrew command for libsodium
winitzki May 14, 2024
2051af2
wip
winitzki May 14, 2024
7a07825
Revert "wip add explicit homebrew command for libsodium"
winitzki May 22, 2024
64f5b08
wip
winitzki May 22, 2024
f65cd84
bump ci
winitzki May 22, 2024
ab71435
change a to b
winitzki May 22, 2024
81631fc
Revert "change a to b"
winitzki May 24, 2024
31d208d
reinstall libsodium
winitzki May 24, 2024
403e3b2
Revert "Revert "change a to b""
winitzki May 24, 2024
bab2328
remove libsodium override as it does not work
winitzki May 24, 2024
c7eeed9
wip
winitzki May 24, 2024
f22df54
wip
winitzki May 24, 2024
676cc85
use macos-14-large
winitzki May 24, 2024
6af4a2e
remove hnix override
winitzki May 24, 2024
80c3493
wip
winitzki May 24, 2024
3b52b01
wip
winitzki May 25, 2024
d92796b
use macos-14-latest
winitzki May 26, 2024
220841f
use macos-13
winitzki May 26, 2024
372f259
respond to comments from mmhut
winitzki May 31, 2024
eea223e
try with macos-latest once again
winitzki May 31, 2024
f57f72f
revert dummy change
winitzki May 31, 2024
f23ccaf
add macos-13
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- runner: 'macOS-latest'
- runner: 'macos-13'
archive-command: 'tar --create --bzip2 --file'
file-extension: 'tar.bz2'
executable-extension: ''
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
${{ matrix.os.runner }}-
path: |
${{ steps.setup-haskell-cabal.outputs.stack-root }}
- name: Install libsodium
- name: Install libsodium x86_64
Copy link
Collaborator

@mmhat mmhat May 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- name: Install libsodium x86_64
- name: Install libsodium

shell: bash
run: |
if [ '${{matrix.os.runner}}' == 'ubuntu-latest' ]; then
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ queue_rules:
- check-success=hydra
# Mergify explicitly recommends listing each status check separately:
# https://docs.mergify.io/conditions/#validating-all-status-checks
- check-success=macOS-latest - stack.yaml
- check-success=macos-13 - stack.yaml
- check-success=ubuntu-latest - stack.yaml
- check-success=windows-latest - stack.yaml
pull_request_rules:
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Eval.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ instance Semigroup (VChunks a) where
VChunks xys z <> VChunks [] z' = VChunks xys (z <> z')
VChunks xys z <> VChunks ((x', y'):xys') z' = VChunks (xys ++ (z <> x', y'):xys') z'

instance Monoid (VChunks a) where
instance Monoid (VChunks b) where
mempty = VChunks [] mempty

{-| Some information is lost when `eval` converts a `Lam` or a built-in function
Expand Down