From 4b276459d1ae4ed25459f2f08768b61c63e49ba9 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 12 Sep 2023 15:23:19 +0100 Subject: [PATCH] Merge prod into main (#691) * Merge main into prod (#690) * build(deps-dev): bump io.smallrye:smallrye-open-api-core (#674) Bumps [io.smallrye:smallrye-open-api-core](https://github.com/smallrye/smallrye-open-api) from 3.5.0 to 3.5.2. - [Release notes](https://github.com/smallrye/smallrye-open-api/releases) - [Commits](https://github.com/smallrye/smallrye-open-api/compare/3.5.0...3.5.2) --- updated-dependencies: - dependency-name: io.smallrye:smallrye-open-api-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump org.eclipse.jetty:jetty-client from 11.0.15 to 12.0.1 (#671) Bumps org.eclipse.jetty:jetty-client from 11.0.15 to 12.0.1. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps-dev): bump org.eclipse.jetty:jetty-server (#670) Bumps org.eclipse.jetty:jetty-server from 11.0.15 to 12.0.1. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump com.microsoft.azure:applicationinsights-runtime-attach (#668) Bumps [com.microsoft.azure:applicationinsights-runtime-attach](https://github.com/Microsoft/ApplicationInsights-Java) from 3.4.15 to 3.4.16. - [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases) - [Changelog](https://github.com/microsoft/ApplicationInsights-Java/blob/main/CHANGELOG.md) - [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/3.4.15...3.4.16) --- updated-dependencies: - dependency-name: com.microsoft.azure:applicationinsights-runtime-attach dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump docker/build-push-action from 4.1.1 to 4.2.1 (#675) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.1.1 to 4.2.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/2eb1c1961a95fc15694676618e422e8ba1d63825...0a97817b6ade9f46837855d676c4cca3a2471fc9) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump quarkus.version from 3.3.1 to 3.3.2 (#676) Bumps `quarkus.version` from 3.3.1 to 3.3.2. Updates `io.quarkus:quarkus-bom` from 3.3.1 to 3.3.2 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.3.1...3.3.2) Updates `io.quarkus:quarkus-security` from 3.3.1 to 3.3.2 Updates `io.quarkus:quarkus-core` from 3.3.1 to 3.3.2 Updates `io.quarkus:quarkus-elytron-security-properties-file` from 3.3.1 to 3.3.2 Updates `io.quarkus:quarkus-resteasy-reactive` from 3.3.1 to 3.3.2 --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-security dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-elytron-security-properties-file dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-resteasy-reactive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump org.pitest:pitest-maven from 1.14.2 to 1.14.4 (#677) Bumps [org.pitest:pitest-maven](https://github.com/hcoles/pitest) from 1.14.2 to 1.14.4. - [Release notes](https://github.com/hcoles/pitest/releases) - [Commits](https://github.com/hcoles/pitest/compare/1.14.2...1.14.4) --- updated-dependencies: - dependency-name: org.pitest:pitest-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin (#679) Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.3.0...enforcer-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump rest-assured.version from 5.3.1 to 5.3.2 (#678) Bumps `rest-assured.version` from 5.3.1 to 5.3.2. Updates `io.rest-assured:rest-assured` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:json-path` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.rest-assured:json-path dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1 (#683) Bumps [io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1](https://github.com/open-telemetry/opentelemetry-java-instrumentation) from 1.28.0-alpha to 1.29.0-alpha. - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) --- updated-dependencies: - dependency-name: io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * add DigitalOcean to redeploy steps (#680) * add DigitalOcean to redeploy steps * fix cluster name * Split common code into actions * put actions in correct locations * another fix (#687) * fix actions path (#688) * add shell to commands (#689) --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: John Oliver <1615532+johnoliver@users.noreply.github.com> * Update deploy-adoptopenjdk.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: John Oliver <1615532+johnoliver@users.noreply.github.com> --- .github/workflows/deploy-adoptopenjdk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-adoptopenjdk.yml b/.github/workflows/deploy-adoptopenjdk.yml index 8f859d6c5..c8a2bb3ce 100644 --- a/.github/workflows/deploy-adoptopenjdk.yml +++ b/.github/workflows/deploy-adoptopenjdk.yml @@ -47,7 +47,7 @@ jobs: - name: Login to DigitalOcean uses: ./.github/actions/do-login with: - token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }} + DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }} - name: Redeploy Kubernetes Updater and Frontend if: startsWith(github.ref, 'refs/heads/production')