Skip to content

Commit 032765d

Browse files
committed
updated macos action with docker install
1 parent a2ece1e commit 032765d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/actions/gmt-pytest/action.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,14 @@ runs:
3131
path: venv
3232
key: pip-${{ steps.setup_python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements-dev.txt') }}-${{ hashFiles('metric_providers/psu/energy/ac/xgboost/machine/model/requirements.txt') }}
3333

34-
- name: Setup upterm session
35-
uses: lhotari/action-upterm@v1
36-
34+
- name: Install docker for MacOS
35+
if: runner.os == 'macOS'
36+
run: |
37+
brew install docker docker-compose
38+
mkdir -p ~/.docker/cli-plugins
39+
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
40+
colima start
41+
3742
- name: install script and packages
3843
shell: bash
3944
working-directory: ${{ inputs.gmt-directory }}
@@ -79,6 +84,9 @@ runs:
7984
fi
8085
fi
8186
87+
- name: Setup upterm session
88+
uses: lhotari/action-upterm@v1
89+
8290
- name: Start Test container
8391
shell: bash
8492
working-directory: ${{ inputs.gmt-directory }}/tests

install_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ if [[ ${host_metrics_url} == *".green-coding.internal"* ]];then
129129
fi
130130

131131
if ! command -v stdbuf &> /dev/null; then
132-
print_message "Trying to install 'coreutils' via homebew. If this fails (because you do not have brew or use another package manager), please install it manually ..."
132+
print_message "Trying to install 'coreutils' via homebrew. If this fails (because you do not have brew or use another package manager), please install it manually ..."
133133
brew install coreutils
134134
fi
135135

0 commit comments

Comments
 (0)