Fix M1 CI

This commit is contained in:
Julian Ospald 2022-05-19 21:01:48 +02:00
parent ca89112a8e
commit 1cffa358b8
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F

View File

@ -206,7 +206,7 @@ variables:
# otherwise we seem to get intel binaries # otherwise we seem to get intel binaries
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1 - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
# update and install packages # update and install packages
- /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake - /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake coreutils
# extract cabal cache # extract cabal cache
- ./.gitlab/script/ci.sh extract_cabal_cache - ./.gitlab/script/ci.sh extract_cabal_cache
script: | script: |
@ -574,7 +574,7 @@ release:darwin:aarch64:
# otherwise we seem to get intel binaries # otherwise we seem to get intel binaries
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1 - export HOMEBREW_CHANGE_ARCH_TO_ARM=1
# update and install packages # update and install packages
- /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake - /bin/bash ./.gitlab/script/brew.sh llvm autoconf automake coreutils
script: | script: |
export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH" export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang