summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorArchez <Archez@users.noreply.github.com>2024-11-05 23:17:14 -0500
committerGitHub <noreply@github.com>2024-11-05 23:17:14 -0500
commitc2ec2f2cc3a49bff45106fdaf4cccc90f2b8a149 (patch)
tree5573952985ae3fdf0ed98b80df95c0b182bbc193 /.github
parent207df24ffde84bc6e89fd1fd54653b7542661d32 (diff)
Fix installed macports detection for github runner (#821)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/main.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02931a149..db96aa3d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -192,15 +192,17 @@ jobs:
key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}
restore-keys: |
${{ runner.os }}-14-macports-
+ # Updated PATH applies to the next step and onwards
- name: Install MacPorts (if necessary)
run: |
- if [ command -v port &>/dev/null ]; then
+ if command -v /opt/local/bin/port 2>&1 >/dev/null; then
echo "MacPorts already installed"
else
+ echo "Installing MacPorts"
wget https://github.com/macports/macports-base/releases/download/v2.9.3/MacPorts-2.9.3-14-Sonoma.pkg
sudo installer -pkg ./MacPorts-2.9.3-14-Sonoma.pkg -target /
fi
- echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH
+ echo "/opt/local/bin:/opt/local/sbin" >> "$GITHUB_PATH"
- name: Install dependencies
run: |
brew uninstall --ignore-dependencies libpng