Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions .github/actions/setup-botan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ runs:
# We only build the static and dynamic libraries and the executable, but not
# the documentation or the tests.

- name: "🛠️ [Unix]: Build Botan"
if: ${{ runner.os == 'Linux' || runner.os == 'MacOS' }}
- name: "🛠️ [Linux]: Build Botan"
if: ${{ runner.os == 'Linux' }}
shell: sh
working-directory: ./tmp-botan
run: |
Expand All @@ -52,6 +52,20 @@ runs:
--without-documentation
make

# Workaround for <https://github.com/randombit/botan/issues/5940>: use
# --without-os-feature=sandbox_proc on MacOS
- name: "🛠️ [MacOS]: Build Botan"
if: ${{ runner.os == 'macOS' }}
shell: sh
working-directory: ./tmp-botan
run: |
python3 ./configure.py \
--compiler-cache=ccache \
--build-targets=static,shared,cli \
--without-documentation \
--without-os-feature=sandbox_proc
make

# Note: on Windows we assume the caller of the action is using MSYS2 with the
# MINGW64 environment. We could make the action more general purpose, but then
# we should make a few things configurable, like the shell and install
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,17 @@ jobs:
- name: 📥 Checkout repository
uses: actions/checkout@v7

# Workaround for regression <https://github.com/actions/runner-images/issues/14940>,
# copied from <https://github.com/actonlang/acton/pull/3283>.
#
# TODO: remove this workaround once the regression is fixed for the GH runner
- name: "Use the Command Line Tools toolchain"
if: ${{ runner.os == 'macOS' }}
run: sudo xcode-select -s /Library/Developer/CommandLineTools

- name: 🛠️ Setup Haskell
id: setup-haskell
uses: haskell-actions/setup@v2.12.0
uses: haskell-actions/setup@v2.12.1
with:
ghc-version: ${{ matrix.ghc-version }}
cabal-version: ${{ matrix.cabal-version }}
Expand Down Expand Up @@ -327,7 +335,7 @@ jobs:

- name: 🛠️ Setup Haskell
id: setup-haskell
uses: haskell-actions/setup@v2.12.0
uses: haskell-actions/setup@v2.12.1
with:
ghc-version: "9.6"
cabal-version: "3.16"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: 🛠️ Setup Haskell
id: setup-haskell
uses: haskell-actions/setup@v2.12.0
uses: haskell-actions/setup@v2.12.1
with:
ghc-version: ${{ env.ghc-version }}
cabal-version: ${{ env.cabal-version }}
Expand Down
Loading