diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfb74c1f..0353e008 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,25 +2,22 @@ name: CI on: [push] env: + MACOS_CI_SETUP_TOKEN: ${{ secrets.MACOS_CI_SETUP_TOKEN }} VM_NAME: sequoia-for-pillarbox + VM_IMAGE: ghcr.io/cirruslabs/macos-sequoia-base:latest jobs: install-tools: runs-on: labels: [tart, macos] steps: - name: Clone macos-ci-setup repository - env: - MACOS_CI_SETUP_TOKEN: ${{ secrets.MACOS_CI_SETUP_TOKEN }} run: | rm -rf ~/macos-ci-setup git clone -b add-scripts https://$MACOS_CI_SETUP_TOKEN@github.com/SRGSSR/macos-ci-setup.git ~/macos-ci-setup - - name: Install tools - env: - MACOS_CI_SETUP_TOKEN: ${{ secrets.MACOS_CI_SETUP_TOKEN }} run: | cd ~/macos-ci-setup - ./create-vm-for-project.sh $VM_NAME ghcr.io/cirruslabs/macos-sonoma-xcode:latest + ./create-vm-for-project.sh $VM_NAME $VM_IMAGE ./clone-repo-in-vm.sh "https://$MACOS_CI_SETUP_TOKEN@github.com/SRGSSR/fake-and-temporary-pa-for-runners.git" $VM_NAME ./brew-fetch-and-sync.sh $VM_NAME mint shellcheck markdownlint-cli yamllint ffmpeg ./run-vm-shell-command.sh $VM_NAME "brew install mint shellcheck markdownlint-cli yamllint ffmpeg" @@ -37,8 +34,6 @@ jobs: labels: [tart, macos] steps: - name: Setup project - env: - MACOS_CI_SETUP_TOKEN: ${{ secrets.MACOS_CI_SETUP_TOKEN }} run: | cd ~/macos-ci-setup ./run-vm-shell-command.sh $VM_NAME "cd ~/_repo && rm -rf Configuration"