From d6055a07faba2b02b3d47a70885d8b3b40c8e596 Mon Sep 17 00:00:00 2001 From: DecFox <33030671+DecFox@users.noreply.github.com> Date: Thu, 27 Feb 2025 09:43:29 +0530 Subject: [PATCH] fix: upgrade to using macos-13 for mac workflows (#1692) ## Checklist - [ ] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [ ] reference issue for this pull request: - [ ] if you changed anything related to how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request: - [ ] if you changed code inside an experiment, make sure you bump its version number ## Description macos-12 has been deprecated and it seems, our workflows are taking quite long in the queue. This should fix it since a macos-13 runner should be more available. --- .github/workflows/ios.yml | 2 +- .github/workflows/macos.yml | 6 +++--- .github/workflows/netxlite.yml | 2 +- internal/cmd/ghgen/config.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 7d40e14d10..a6264aa207 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -14,7 +14,7 @@ on: jobs: build_ios_mobile: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 40d7c3a211..409269b60e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,7 +14,7 @@ on: jobs: build_darwin_cli: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: @@ -58,7 +58,7 @@ jobs: path: ./CLI/miniooni-darwin-arm64 test_darwin_cli: - runs-on: macos-12 + runs-on: macos-13 needs: build_darwin_cli steps: - uses: actions/checkout@v4 @@ -74,7 +74,7 @@ jobs: shell: bash publish_darwin_cli: - runs-on: macos-12 + runs-on: macos-13 needs: test_darwin_cli permissions: contents: write diff --git a/.github/workflows/netxlite.yml b/.github/workflows/netxlite.yml index 8deeba356c..e177271fb5 100644 --- a/.github/workflows/netxlite.yml +++ b/.github/workflows/netxlite.yml @@ -15,7 +15,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - os: [ "ubuntu-22.04", "windows-2022", "macos-12" ] + os: [ "ubuntu-22.04", "windows-2022", "macos-13" ] steps: - uses: actions/checkout@v4 diff --git a/internal/cmd/ghgen/config.go b/internal/cmd/ghgen/config.go index 7724fcf47c..a0c8ad4c16 100644 --- a/internal/cmd/ghgen/config.go +++ b/internal/cmd/ghgen/config.go @@ -55,7 +55,7 @@ const ( runsOnUbuntu = "ubuntu-22.04" // runsOnMacOS is the macOS system where to run. - runsOnMacOS = "macos-12" + runsOnMacOS = "macos-13" // runsOnWindows is the windows system where to run. runsOnWindows = "windows-2022"