Skip to content

Commit

Permalink
Updated MacOS runners to using Github runners (#186)
Browse files Browse the repository at this point in the history
* Updated MacOS runners to using GitLab runners

* Updated location for bootstrap script

* Revert to using Python 3.11 for running
  • Loading branch information
dmurphy18 authored Nov 21, 2024
1 parent d88c3f5 commit 677666e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ self-hosted-runner:
labels:
# Not self hosted but actionlint still does not have a
# release out supporting it
- macos-13-large
- macos-13-xlarge
- macos-13
- macos-14
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
- name: Install Salt
run: |
curl -L https://bootstrap.saltstack.com | sudo sh -s -- -M -X -x python3 stable ${{ matrix.salt-version }}
curl -L https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh | sudo sh -s -- -M -X -x python3 stable ${{ matrix.salt-version }}
sudo apt-get install -y salt-api salt-ssh salt-syndic salt-cloud python3-pip
for service in $(sudo systemctl list-unit-files | grep salt | grep -v @ | awk '{ print $1 }'); do sudo systemctl stop "$service"; done
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:


MacOS:
runs-on: ${{ github.event.repository.fork && 'macos-latest' || 'macos-13-large' }}
runs-on: ${{ github.event.repository.fork && 'macos-latest' || 'macos-13' }}
needs: Pre-Commit

timeout-minutes: 90
Expand Down

0 comments on commit 677666e

Please sign in to comment.