Skip to content

Commit

Permalink
Merge pull request #5031 from IntersectMBO/coot/pacman
Browse files Browse the repository at this point in the history
GHA: install system dependencies via pacman
  • Loading branch information
coot authored Jan 2, 2025
2 parents 5157674 + 6a028c3 commit 97da5ee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,18 @@ jobs:

steps:

- name: "Install System Dependencies via pacman (msys2)"
if: runner.os == 'Windows'
shell: 'C:/msys64/usr/bin/bash.exe -e {0}'
run: |
/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-pkg-config mingw-w64-x86_64-openssl mingw-w64-x86_64-sed base-devel autoconf-wrapper autoconf automake libtool make
- name: Install Haskell
uses: input-output-hk/actions/haskell@latest
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: "3.12.1.0"
pacman-packages: >
mingw-w64-x86_64-pkg-config
mingw-w64-x86_64-openssl
mingw-w64-x86_64-sed
base-devel
autoconf-wrapper
autoconf
automake
libtool
make

- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions scripts/release-to-chap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if [[ $REPORT == 1 ]] then
else

branch=$(git rev-parse --abbrev-ref HEAD)
if [[ !($TEST) && !($branch =~ ^(main|release/.*)$) ]]; then
if [[ $TEST == 0 && !($branch =~ ^(main|release/.*)$) ]]; then
echo "error: one must release from main or a release/* branch, pass a -t switch to skip this test"
exit 1
fi
Expand All @@ -82,7 +82,7 @@ else
git pull
fi
BRANCH="network/release-$(date -I)"
if [[ $TEST ]];then
if [[ $TEST == 1 ]];then
BRANCH="${BRANCH}-DO_NOT_MERGE"
fi
git switch -c $BRANCH
Expand All @@ -103,7 +103,7 @@ else
git --no-pager log --oneline origin/main..HEAD

popd > /dev/null
if [[ !($TEST) ]];then
if [[ $TEST == 0 ]];then
trace "created tags:"
git tag --points-at=HEAD
trace "please run ./scripts/build-with-chap.sh"
Expand Down

0 comments on commit 97da5ee

Please sign in to comment.