diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml index b8fdf9892..bcc0faa62 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml @@ -211,6 +211,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/internal/pkg/templates/provider/.github/workflows/verify-release.yml b/provider-ci/internal/pkg/templates/provider/.github/workflows/verify-release.yml index 132f2c336..6619727a1 100644 --- a/provider-ci/internal/pkg/templates/provider/.github/workflows/verify-release.yml +++ b/provider-ci/internal/pkg/templates/provider/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean @@ -64,7 +64,7 @@ jobs: # Expression expands to ["ubuntu-latest","windows-latest"] or ["ubuntu-latest","windows-latest","macos-latest"] # GitHub expressions don't have 'if' statements, so we use a ternary operator to conditionally include the MacOS runner suffix. # See the docs for a similar example to this: https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson - runner: ${{ fromJSON(format('["ubuntu-latest","windows-latest"{0}]', github.event.inputs.enableMacRunner == 'true' && ',"macos-latest"' || '')) }} + runner: ${{ fromJSON(format('["ubuntu-latest","windows-latest"{0}]', inputs.enableMacRunner && ',"macos-latest"' || '')) }} #{{- else }}# # We don't have any release verification configurations, so we only run on Linux to print warnings to help users configure the release verification. runner: ["ubuntu-latest"] diff --git a/provider-ci/test-providers/acme/.github/workflows/publish.yml b/provider-ci/test-providers/acme/.github/workflows/publish.yml index b02c46109..8e131487d 100644 --- a/provider-ci/test-providers/acme/.github/workflows/publish.yml +++ b/provider-ci/test-providers/acme/.github/workflows/publish.yml @@ -179,6 +179,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/test-providers/acme/.github/workflows/verify-release.yml b/provider-ci/test-providers/acme/.github/workflows/verify-release.yml index dec42ef1c..f87b3cad5 100644 --- a/provider-ci/test-providers/acme/.github/workflows/verify-release.yml +++ b/provider-ci/test-providers/acme/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean diff --git a/provider-ci/test-providers/aws/.github/workflows/publish.yml b/provider-ci/test-providers/aws/.github/workflows/publish.yml index 0930b50c8..6a6f2715b 100644 --- a/provider-ci/test-providers/aws/.github/workflows/publish.yml +++ b/provider-ci/test-providers/aws/.github/workflows/publish.yml @@ -215,6 +215,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/test-providers/aws/.github/workflows/verify-release.yml b/provider-ci/test-providers/aws/.github/workflows/verify-release.yml index 375d906d7..39698d6d2 100644 --- a/provider-ci/test-providers/aws/.github/workflows/verify-release.yml +++ b/provider-ci/test-providers/aws/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean @@ -71,7 +71,7 @@ jobs: # Expression expands to ["ubuntu-latest","windows-latest"] or ["ubuntu-latest","windows-latest","macos-latest"] # GitHub expressions don't have 'if' statements, so we use a ternary operator to conditionally include the MacOS runner suffix. # See the docs for a similar example to this: https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson - runner: ${{ fromJSON(format('["ubuntu-latest","windows-latest"{0}]', github.event.inputs.enableMacRunner == 'true' && ',"macos-latest"' || '')) }} + runner: ${{ fromJSON(format('["ubuntu-latest","windows-latest"{0}]', inputs.enableMacRunner && ',"macos-latest"' || '')) }} runs-on: ${{ matrix.runner }} steps: - name: Checkout Repo diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml b/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml index 35a1bf8ab..14f85953b 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml @@ -212,6 +212,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/verify-release.yml b/provider-ci/test-providers/cloudflare/.github/workflows/verify-release.yml index a54750964..5f04b261d 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/verify-release.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean diff --git a/provider-ci/test-providers/docker/.github/workflows/publish.yml b/provider-ci/test-providers/docker/.github/workflows/publish.yml index 5c785c131..bd5b1f415 100644 --- a/provider-ci/test-providers/docker/.github/workflows/publish.yml +++ b/provider-ci/test-providers/docker/.github/workflows/publish.yml @@ -225,6 +225,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/test-providers/docker/.github/workflows/verify-release.yml b/provider-ci/test-providers/docker/.github/workflows/verify-release.yml index 26c658226..97f3cd02c 100644 --- a/provider-ci/test-providers/docker/.github/workflows/verify-release.yml +++ b/provider-ci/test-providers/docker/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean diff --git a/provider-ci/test-providers/eks/.github/workflows/publish.yml b/provider-ci/test-providers/eks/.github/workflows/publish.yml index a20924f0b..764aea5f9 100644 --- a/provider-ci/test-providers/eks/.github/workflows/publish.yml +++ b/provider-ci/test-providers/eks/.github/workflows/publish.yml @@ -217,6 +217,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/provider-ci/test-providers/eks/.github/workflows/verify-release.yml b/provider-ci/test-providers/eks/.github/workflows/verify-release.yml index 89552c998..1457d6397 100644 --- a/provider-ci/test-providers/eks/.github/workflows/verify-release.yml +++ b/provider-ci/test-providers/eks/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean