Skip to content

Commit 772d6d1

Browse files
jasonmcintoshjasonmcintosh
authored
Merge branch 'master' into fixLambdaTimeouts
2 parents f3ef6f2 + 0284e75 commit 772d6d1

File tree

385 files changed

+16576
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+16576
-2058
lines changed

‎.github/workflows/build.yml

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- release-*
88

99
env:
10-
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
10+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g
1111
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
1212

1313
jobs:
@@ -16,16 +16,18 @@ jobs:
1616
if: startsWith(github.repository, 'spinnaker/')
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v2
23+
uses: docker/setup-qemu-action@v3
2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2
26-
- uses: actions/setup-java@v3
25+
uses: docker/setup-buildx-action@v3
26+
- uses: actions/setup-java@v4
2727
with:
28-
java-version: 11
28+
java-version: |
29+
11
30+
17
2931
distribution: 'zulu'
3032
cache: 'gradle'
3133
- name: Prepare build variables
@@ -36,11 +38,24 @@ jobs:
3638
- name: Build
3739
env:
3840
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
39-
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
41+
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
42+
- name: Build local slim container image for testing
43+
uses: docker/build-push-action@v6
44+
with:
45+
context: .
46+
file: Dockerfile.slim
47+
load: true
48+
platforms: local
49+
tags: |
50+
"${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
51+
- name: Test local slim container image
52+
env:
53+
FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
54+
run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test
4055
- name: Login to GAR
4156
# Only run this on repositories in the 'spinnaker' org, not on forks.
4257
if: startsWith(github.repository, 'spinnaker/')
43-
uses: docker/login-action@v2
58+
uses: docker/login-action@v3
4459
# use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
4560
with:
4661
registry: us-docker.pkg.dev
@@ -49,7 +64,7 @@ jobs:
4964
- name: Build and publish slim container image
5065
# Only run this on repositories in the 'spinnaker' org, not on forks.
5166
if: startsWith(github.repository, 'spinnaker/')
52-
uses: docker/build-push-action@v4
67+
uses: docker/build-push-action@v6
5368
with:
5469
context: .
5570
file: Dockerfile.slim
@@ -63,7 +78,7 @@ jobs:
6378
- name: Build and publish ubuntu container image
6479
# Only run this on repositories in the 'spinnaker' org, not on forks.
6580
if: startsWith(github.repository, 'spinnaker/')
66-
uses: docker/build-push-action@v4
81+
uses: docker/build-push-action@v6
6782
with:
6883
context: .
6984
file: Dockerfile.ubuntu
@@ -72,3 +87,28 @@ jobs:
7287
tags: |
7388
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
7489
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
90+
- name: Build and publish slim JRE 11 container image
91+
# Only run this on repositories in the 'spinnaker' org, not on forks.
92+
if: startsWith(github.repository, 'spinnaker/')
93+
uses: docker/build-push-action@v6
94+
with:
95+
context: .
96+
file: Dockerfile.java11.slim
97+
platforms: linux/amd64,linux/arm64
98+
push: true
99+
tags: |
100+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated"
101+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated"
102+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-slim"
103+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
104+
- name: Build and publish ubuntu JRE 11 container image
105+
# Only run this on repositories in the 'spinnaker' org, not on forks.
106+
if: startsWith(github.repository, 'spinnaker/')
107+
uses: docker/build-push-action@v6
108+
with:
109+
context: .
110+
file: Dockerfile.java11.ubuntu
111+
push: true
112+
tags: |
113+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu"
114+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"

‎.github/workflows/docs_master.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.github/workflows/pr.yml

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@ name: PR Build
33
on: [ pull_request ]
44

55
env:
6-
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
6+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g
77
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
88

99
jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v2
17+
uses: docker/setup-qemu-action@v3
1818
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v2
20-
- uses: actions/setup-java@v3
19+
uses: docker/setup-buildx-action@v3
20+
- uses: actions/setup-java@v4
2121
with:
22-
java-version: 11
22+
java-version: |
23+
11
24+
17
2325
distribution: 'zulu'
2426
cache: 'gradle'
2527
- name: Prepare build variables
@@ -30,9 +32,9 @@ jobs:
3032
- name: Build
3133
env:
3234
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
33-
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
35+
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
3436
- name: Build slim container image
35-
uses: docker/build-push-action@v4
37+
uses: docker/build-push-action@v6
3638
with:
3739
context: .
3840
file: Dockerfile.slim
@@ -43,11 +45,44 @@ jobs:
4345
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-slim"
4446
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-slim"
4547
- name: Build ubuntu container image
46-
uses: docker/build-push-action@v4
48+
uses: docker/build-push-action@v6
4749
with:
4850
context: .
4951
file: Dockerfile.ubuntu
5052
platforms: linux/amd64,linux/arm64
5153
tags: |
5254
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
5355
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"
56+
- name: Build slim JRE 11 container image
57+
uses: docker/build-push-action@v6
58+
with:
59+
context: .
60+
file: Dockerfile.java11.slim
61+
platforms: linux/amd64,linux/arm64
62+
tags: |
63+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11"
64+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11"
65+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-slim"
66+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-slim"
67+
- name: Build ubuntu JRE 11 container image
68+
uses: docker/build-push-action@v6
69+
with:
70+
context: .
71+
file: Dockerfile.java11.ubuntu
72+
platforms: linux/amd64,linux/arm64
73+
tags: |
74+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu"
75+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
76+
- name: Build local slim container image for testing
77+
uses: docker/build-push-action@v6
78+
with:
79+
context: .
80+
file: Dockerfile.slim
81+
load: true
82+
platforms: local
83+
tags: |
84+
"${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
85+
- name: Test local slim container image
86+
env:
87+
FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
88+
run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test

‎.github/workflows/release.yml

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
- "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
88

99
env:
10-
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g -Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.remote.repository.deploy.max.attempts=6
10+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g -Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.remote.repository.deploy.max.attempts=6
1111
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
1212

1313
jobs:
1414
release:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
# Given a tag, determine what branch we are on, so we can bump dependencies in the correct branch
@@ -38,12 +38,14 @@ jobs:
3838
echo "exactly one branch ($BRANCHES)"
3939
echo BRANCH=$BRANCHES >> $GITHUB_ENV
4040
- name: Set up QEMU
41-
uses: docker/setup-qemu-action@v2
41+
uses: docker/setup-qemu-action@v3
4242
- name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@v2
44-
- uses: actions/setup-java@v3
43+
uses: docker/setup-buildx-action@v3
44+
- uses: actions/setup-java@v4
4545
with:
46-
java-version: 11
46+
java-version: |
47+
11
48+
17
4749
distribution: 'zulu'
4850
cache: 'gradle'
4951
- name: Assemble release info
@@ -70,34 +72,34 @@ jobs:
7072
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
7173
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
7274
run: |
73-
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
75+
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
7476
- name: Publish apt packages to Google Artifact Registry
7577
env:
7678
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
7779
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
7880
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
7981
run: |
80-
./gradlew --info publish
82+
./gradlew -PenableCrossCompilerPlugin=true --info publish
8183
- name: Login to Google Cloud
8284
# Only run this on repositories in the 'spinnaker' org, not on forks.
8385
if: startsWith(github.repository, 'spinnaker/')
84-
uses: 'google-github-actions/auth@v1'
86+
uses: 'google-github-actions/auth@v2'
8587
# use service account flow defined at: https://github.com/google-github-actions/upload-cloud-storage#authenticating-via-service-account-key-json
8688
with:
8789
credentials_json: '${{ secrets.GAR_JSON_KEY }}'
8890
- name: Upload halconfig profiles to GCS
8991
# https://console.cloud.google.com/storage/browser/halconfig
9092
# Only run this on repositories in the 'spinnaker' org, not on forks.
9193
if: startsWith(github.repository, 'spinnaker/')
92-
uses: 'google-github-actions/upload-cloud-storage@v1'
94+
uses: 'google-github-actions/upload-cloud-storage@v2'
9395
with:
9496
path: 'halconfig/'
9597
destination: 'halconfig/${{ steps.build_variables.outputs.REPO }}/${{ steps.release_info.outputs.RELEASE_VERSION }}'
9698
parent: false
9799
- name: Login to GAR
98100
# Only run this on repositories in the 'spinnaker' org, not on forks.
99101
if: startsWith(github.repository, 'spinnaker/')
100-
uses: docker/login-action@v2
102+
uses: docker/login-action@v3
101103
# use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
102104
with:
103105
registry: us-docker.pkg.dev
@@ -106,7 +108,7 @@ jobs:
106108
- name: Build and publish slim container image
107109
# Only run this on repositories in the 'spinnaker' org, not on forks.
108110
if: startsWith(github.repository, 'spinnaker/')
109-
uses: docker/build-push-action@v4
111+
uses: docker/build-push-action@v6
110112
with:
111113
context: .
112114
file: Dockerfile.slim
@@ -119,7 +121,7 @@ jobs:
119121
- name: Build and publish ubuntu container image
120122
# Only run this on repositories in the 'spinnaker' org, not on forks.
121123
if: startsWith(github.repository, 'spinnaker/')
122-
uses: docker/build-push-action@v4
124+
uses: docker/build-push-action@v6
123125
with:
124126
context: .
125127
file: Dockerfile.ubuntu
@@ -128,9 +130,34 @@ jobs:
128130
tags: |
129131
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
130132
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
133+
- name: Build and publish slim JRE 11 container image
134+
# Only run this on repositories in the 'spinnaker' org, not on forks.
135+
if: startsWith(github.repository, 'spinnaker/')
136+
uses: docker/build-push-action@v6
137+
with:
138+
context: .
139+
file: Dockerfile.java11.slim
140+
platforms: linux/amd64,linux/arm64
141+
push: true
142+
tags: |
143+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated"
144+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-slim"
145+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-slim"
146+
- name: Build and publish ubuntu JRE 11 container image
147+
# Only run this on repositories in the 'spinnaker' org, not on forks.
148+
if: startsWith(github.repository, 'spinnaker/')
149+
uses: docker/build-push-action@v6
150+
with:
151+
context: .
152+
file: Dockerfile.java11.ubuntu
153+
platforms: linux/amd64,linux/arm64
154+
push: true
155+
tags: |
156+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-java11-unvalidated-ubuntu"
157+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
131158
- name: Create release
132159
if: steps.release_info.outputs.SKIP_RELEASE == 'false'
133-
uses: softprops/action-gh-release@v1
160+
uses: softprops/action-gh-release@v2
134161
with:
135162
body: |
136163
${{ steps.release_info.outputs.CHANGELOG }}
@@ -142,7 +169,7 @@ jobs:
142169
- name: Pause before dependency bump
143170
run: sleep 900
144171
- name: Trigger dependency bump workflow
145-
uses: peter-evans/repository-dispatch@v2
172+
uses: peter-evans/repository-dispatch@v3
146173
with:
147174
token: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}
148175
event-type: bump-dependencies

0 commit comments

Comments
 (0)