diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 848874d9a68..676affd63c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,9 +43,9 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/package-bump-pr.yml b/.github/workflows/package-bump-pr.yml index 942c496cbcd..c4f41a280f3 100644 --- a/.github/workflows/package-bump-pr.yml +++ b/.github/workflows/package-bump-pr.yml @@ -92,7 +92,7 @@ jobs: - name: Close package bump due to no changes if: ${{ steps.lerna_bump.outputs.packageBumpCommitHash == '' && steps.createpullrequest.outputs.pull-request-number != '' }} - uses: actions/github-script@v6.4.1 + uses: actions/github-script@v7.0.1 with: github-token: '${{ secrets.SPINNAKERBOT_PERSONAL_ACCESS_TOKEN }}' script: | @@ -102,7 +102,7 @@ jobs: - name: Approve package bump if: ${{ steps.lerna_bump.outputs.packageBumpCommitHash != '' && steps.createpullrequest.outputs.pull-request-number != '' }} - uses: actions/github-script@v6.4.1 + uses: actions/github-script@v7.0.1 with: github-token: '${{ secrets.SPINNAKERBOT_TOKEN }}' script: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3e4a4635a92..7a16100f6a1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -37,9 +37,9 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84bba4a935e..52a6dcd22e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,9 +38,9 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: 'zulu' cache: 'gradle' - name: Assemble release info @@ -78,7 +78,7 @@ jobs: - name: Login to Google Cloud # Only run this on repositories in the 'spinnaker' org, not on forks. if: startsWith(github.repository, 'spinnaker/') - uses: 'google-github-actions/auth@v1' + uses: 'google-github-actions/auth@v2' # use service account flow defined at: https://github.com/google-github-actions/upload-cloud-storage#authenticating-via-service-account-key-json with: credentials_json: '${{ secrets.GAR_JSON_KEY }}' diff --git a/gradle.properties b/gradle.properties index 5e23b7a2615..46932294d9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -spinnakerGradleVersion=8.31.0 +spinnakerGradleVersion=8.32.1 diff --git a/packages/amazon/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx b/packages/amazon/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx index 5a849ad7969..a89f4b0e774 100644 --- a/packages/amazon/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx +++ b/packages/amazon/src/pipeline/stages/deployCloudFormation/CloudFormationChangeSetInfo.tsx @@ -13,7 +13,7 @@ export interface ICloudFormationChangeSetInfoProps { export const CloudFormationChangeSetInfo = (props: ICloudFormationChangeSetInfoProps) => { const { stage, stageconfig } = props; const [changeSetName, setChangeSetName] = useState( - (stage as any).changeSetName ? (stage as any).changeSetName : "ChangeSet-${ execution['id']}", + (stage as any).changeSetName ? (stage as any).changeSetName : "ChangeSet-${execution['id']}", ); const [executeChangeSet, setExecuteChangeSet] = useState((stage as any).executeChangeSet); const [actionOnReplacement, setActionOnReplacement] = useState((stage as any).actionOnReplacement);