Skip to content

Commit 1d0d38b

Browse files
jasonmcintoshjasonmcintosh
authored
Merge branch 'master' into fixLambdaTimeouts
2 parents 88e219f + ede90eb commit 1d0d38b

File tree

12 files changed

+13
-106
lines changed

12 files changed

+13
-106
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
- uses: actions/setup-java@v4
2727
with:
2828
java-version: |
29-
11
3029
17
3130
distribution: 'zulu'
3231
cache: 'gradle'
@@ -38,7 +37,7 @@ jobs:
3837
- name: Build
3938
env:
4039
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
41-
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
40+
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
4241
- name: Build local slim container image for testing
4342
uses: docker/build-push-action@v6
4443
with:
@@ -87,28 +86,3 @@ jobs:
8786
tags: |
8887
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
8988
"${{ 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/pr.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- uses: actions/setup-java@v4
2121
with:
2222
java-version: |
23-
11
2423
17
2524
distribution: 'zulu'
2625
cache: 'gradle'
@@ -32,7 +31,7 @@ jobs:
3231
- name: Build
3332
env:
3433
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
35-
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
34+
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
3635
- name: Build slim container image
3736
uses: docker/build-push-action@v6
3837
with:
@@ -53,26 +52,6 @@ jobs:
5352
tags: |
5453
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
5554
"${{ 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"
7655
- name: Build local slim container image for testing
7756
uses: docker/build-push-action@v6
7857
with:

‎.github/workflows/release.yml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
- uses: actions/setup-java@v4
4545
with:
4646
java-version: |
47-
11
4847
17
4948
distribution: 'zulu'
5049
cache: 'gradle'
@@ -72,14 +71,14 @@ jobs:
7271
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
7372
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
7473
run: |
75-
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
74+
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
7675
- name: Publish apt packages to Google Artifact Registry
7776
env:
7877
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
7978
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
8079
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
8180
run: |
82-
./gradlew -PenableCrossCompilerPlugin=true --info publish
81+
./gradlew --info publish
8382
- name: Login to Google Cloud
8483
# Only run this on repositories in the 'spinnaker' org, not on forks.
8584
if: startsWith(github.repository, 'spinnaker/')
@@ -130,31 +129,6 @@ jobs:
130129
tags: |
131130
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
132131
"${{ 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"
158132
- name: Create release
159133
if: steps.release_info.outputs.SKIP_RELEASE == 'false'
160134
uses: softprops/action-gh-release@v2

‎Dockerfile.compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:jammy
22
RUN apt-get update && apt-get install -y \
33
openjdk-11-jdk \
44
&& rm -rf /var/lib/apt/lists/*

‎Dockerfile.java11.slim

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

‎Dockerfile.java11.ubuntu

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

‎Dockerfile.slim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.16
1+
FROM alpine:3.20
22
LABEL maintainer="sig-platform@spinnaker.io"
33
RUN apk --no-cache add --update bash curl openjdk17-jre
44
RUN addgroup -S -g 10111 spinnaker

‎Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:jammy
22
LABEL maintainer="sig-platform@spinnaker.io"
33
RUN apt-get update && apt-get -y install curl openjdk-17-jre-headless wget
44
RUN adduser --system --uid 10111 --group spinnaker

‎gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
fiatVersion=1.50.0
2-
korkVersion=7.243.0
1+
fiatVersion=1.51.0
2+
korkVersion=7.245.0
33
kotlinVersion=1.6.21
44
org.gradle.parallel=true
55
org.gradle.jvmargs=-Xmx4g
66
spinnakerGradleVersion=8.32.1
7-
targetJava17=false
7+
targetJava17=true
88

99
# To enable a composite reference to a project, set the
1010
# project property `'<projectName>Composite=true'`.

‎gradle/kotlin.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ dependencies {
2525
compileKotlin {
2626
kotlinOptions {
2727
languageVersion = "1.6"
28-
jvmTarget = "11"
28+
jvmTarget = "17"
2929
}
3030
}
3131

3232
compileTestKotlin {
3333
kotlinOptions {
3434
languageVersion = "1.6"
35-
jvmTarget = "11"
35+
jvmTarget = "17"
3636
}
3737
}
3838

‎orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/EchoService.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ interface EchoService {
6565
PUBSUB,
6666
SLACK,
6767
SMS,
68+
CDEVENTS,
6869
}
6970

7071
static enum Severity {

‎orca-retrofit/src/main/java/com/netflix/spinnaker/orca/retrofit/RetrofitInterceptorProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,4 @@
2020

2121
public interface RetrofitInterceptorProvider {
2222
List<okhttp3.Interceptor> getInterceptors();
23-
24-
List<com.squareup.okhttp.Interceptor> getLegacyInterceptors();
2523
}

0 commit comments

Comments
 (0)