diff --git a/.github/actions/set_up_macos/action.yml b/.github/actions/set_up_macos/action.yml index e267c880b..29a7fac2f 100644 --- a/.github/actions/set_up_macos/action.yml +++ b/.github/actions/set_up_macos/action.yml @@ -24,4 +24,8 @@ runs: - uses: cgrindel/gha_set_up_bazel@v1 with: repo_name: ${{ inputs.repo_name }} - + # As of macos-13 runner, go was not on the PATH. This resulted in bazel run + # //:go_update_repos failing. + - uses: actions/setup-go@v4 + with: + go-version: ">=1.20.0" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 652d7cf7b..7025cf508 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,10 +31,10 @@ jobs: runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//bzlmod:e2e_test' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:firebase_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:http_archive_ext_deps_test_bazel_.bazelversion' runner: ubuntu-22.04 @@ -43,37 +43,37 @@ jobs: runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//examples:http_archive_ext_deps_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: false - test: '@@//examples:http_archive_ext_deps_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:interesting_deps_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:ios_sim_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:objc_code_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:phone_number_kit_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:pkg_manifest_minimal_test_bazel_.bazelversion' runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//examples:pkg_manifest_minimal_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:resources_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:soto_example_test_bazel_.bazelversion' runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//examples:soto_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:vapor_example_test_bazel_.bazelversion' runner: ubuntu-22.04 @@ -82,19 +82,19 @@ jobs: runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//examples:vapor_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: false - test: '@@//examples:vapor_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//examples:xcmetrics_example_test_bazel_.bazelversion' - runner: macos-12 + runner: macos-13 enable_bzlmod: true - test: '@@//release:archive_test' runner: ubuntu-22.04 enable_bzlmod: true - test: '@@//release:archive_test' - runner: macos-12 + runner: macos-13 enable_bzlmod: true runs-on: ${{ matrix.runner }} env: @@ -110,7 +110,7 @@ jobs: if: ${{ startsWith(matrix.runner, 'macos') }} with: repo_name: rules_swift_package_manager - xcode_version: 14.0.1 + xcode_version: "14.2" - uses: ./.github/actions/configure_bzlmod with: enabled: ${{ matrix.enable_bzlmod }} @@ -126,7 +126,7 @@ jobs: fail-fast: false matrix: runner: - - macos-12 + - macos-13 - ubuntu-22.04 enable_bzlmod: - true @@ -145,7 +145,7 @@ jobs: if: ${{ startsWith(matrix.runner, 'macos') }} with: repo_name: rules_swift_package_manager - xcode_version: 14.0.1 + xcode_version: "14.2" - uses: ./.github/actions/configure_bzlmod with: enabled: ${{ matrix.enable_bzlmod }} diff --git a/BUILD.bazel b/BUILD.bazel index f780be32b..c9ea77d39 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -87,6 +87,7 @@ execute_binary( "-build_external=external", ], binary = "//tools/update_go_repos", + execute_in_workspace = True, ) # MARK: - Golang diff --git a/tools/generate_ci_workflow/internal/testparams/int_test_params.go b/tools/generate_ci_workflow/internal/testparams/int_test_params.go index 757200382..82a345c78 100644 --- a/tools/generate_ci_workflow/internal/testparams/int_test_params.go +++ b/tools/generate_ci_workflow/internal/testparams/int_test_params.go @@ -25,7 +25,7 @@ func (itp *IntTestParams) EnableBzlmod() bool { func (itp *IntTestParams) Runner() string { switch itp.OS { case MacOS: - return "macos-12" + return "macos-13" case LinuxOS: return "ubuntu-22.04" default: