Skip to content

Commit

Permalink
Try both OSs
Browse files Browse the repository at this point in the history
  • Loading branch information
j-woz committed Sep 5, 2024
1 parent f8da19b commit 2742618
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
strategy:
matrix:
os:
# - ubuntu-latest
- ubuntu-latest
- macos-14

# Comman separated list of python versions to test
# Comma separated list of python versions to test
python-version: ["3.11"]

mpi:
Expand All @@ -42,7 +42,6 @@ jobs:
- name: Install deps
run: |
dev/github-actions/setup-${{ matrix.os }}.sh
# run: sudo apt-get install -y zsh tcl tcl-dev default-jdk autoconf make libcurl4-openssl-dev
# - name: Set up R
# uses: r-lib/actions/setup-r@v2
Expand Down
14 changes: 12 additions & 2 deletions dev/github-actions/setup-macos-14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,20 @@ log()

log "Installing Homebrew packages..."

PKGS=(
autoconf
automake
java
make
mpich
swig
tcl-tk
)

if (
set -ex
set -eux
brew update
brew install autoconf automake java make mpich swig tcl-tk
brew install $PKGS
) >& brew.log
then
log "Installed Homebrew packages in %i seconds."
Expand Down
34 changes: 34 additions & 0 deletions dev/github-actions/setup-ubuntu-latest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/zsh

# SETUP for matrix.os == ubuntu-latest

START=$SECONDS

log()
{
printf "setup-ubuntu-latest.sh: %s\n" "$*"
}

log "Installing Ubuntu packages..."

PKGS=(
autoconf
default-jdk
libcurl4-openssl-dev
make
tcl-dev
zsh
)

if (
set -eux
sudo apt-get install -y $PKGS
) >& apt.log
then
log "Installed Ubuntu packages in %i seconds."
else
log "FAILED to install Ubuntu packages!"
log "apt.log:"
cat apt.log
return 1
fi

0 comments on commit 2742618

Please sign in to comment.