Skip to content

Commit

Permalink
Merge branch 'udpate-graalvm-a' of github.com:googleapis/java-shared-…
Browse files Browse the repository at this point in the history
…config into udpate-graalvm-a
  • Loading branch information
mpeddada1 committed Jul 8, 2024
2 parents aec67ef + 57085e9 commit dd8ed58
Show file tree
Hide file tree
Showing 16 changed files with 93 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .cloudbuild/cloudbuild-test-a.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current}

steps:
# GraalVM A build
Expand Down
2 changes: 1 addition & 1 deletion .cloudbuild/cloudbuild-test-b.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current}

steps:
# GraalVM B build
Expand Down
13 changes: 10 additions & 3 deletions .cloudbuild/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@

timeout: 7200s # 2 hours
substitutions:
_JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current}
_JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current}
steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."]
args: ["build",
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}",
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA",
"--file", "graalvm-a.Dockerfile", "."]
dir: .cloudbuild
id: graalvm-a-build
waitFor: ["-"]
Expand All @@ -29,7 +32,9 @@ steps:

# GraalVM B build
- name: gcr.io/cloud-builders/docker
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ]
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}",
"-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA",
"--file", "graalvm-b.Dockerfile", "." ]
dir: .cloudbuild
id: graalvm-b-build
waitFor: [ "-" ]
Expand All @@ -42,3 +47,5 @@ steps:
images:
- gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}
- gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}
- gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA
- gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:dc11e2119c854b57b7f7ed9962391decf002454700020a52b5d0d46c40b80a7e
# created: 2024-04-15T22:37:28.944513098Z
digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3
# created: 2024-06-05T18:32:21.724930324Z
2 changes: 2 additions & 0 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ branchProtectionRules:
- "build (11, java-bigtable, javadoc)"
- "javadoc-with-doclet (java-bigtable)"
- "cla/google"
- "graalvm-presubmit-shared-config-a (cloud-devrel-kokoro-resources)"
- "graalvm-presubmit-shared-config-b (cloud-devrel-kokoro-resources)"
- pattern: java7
# Can admins overwrite branch protection.
# Defaults to `true`
Expand Down
6 changes: 6 additions & 0 deletions .github/trusted-contribution.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
trustedContributors:
- renovate-bot
- gcf-owl-bot[bot]

annotations:
- type: comment
text: "/gcbrun"
- type: label
text: "kokoro:force-run"
2 changes: 1 addition & 1 deletion .github/workflows/approve-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
script: |
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
matrix:
java: [11, 17, 21]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
Expand All @@ -41,8 +41,8 @@ jobs:
name: "units (8)"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
Expand All @@ -51,7 +51,7 @@ jobs:
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
shell: bash
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand All @@ -63,8 +63,8 @@ jobs:
steps:
- name: Support longpaths
run: git config --system core.longpaths true
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand All @@ -78,8 +78,8 @@ jobs:
matrix:
java: [17]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
Expand All @@ -88,8 +88,8 @@ jobs:
javadoc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand All @@ -100,8 +100,8 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand All @@ -112,8 +112,8 @@ jobs:
clirr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/downstream-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- java-storage
- java-pubsub
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-java@v4
with:
distribution: zulu
Expand All @@ -31,7 +31,7 @@ jobs:
flatten-plugin-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-java@v4
with:
distribution: zulu
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/downstream-maven-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- javadoc # maven-javadoc-plugin
- javadoc-with-doclet # test javadoc generation with doclet
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-java@v4
with:
distribution: zulu
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- java-datastore
- java-bigquerystorage
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-java@v4
with:
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovate_config_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'

Expand Down
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# Changelog

## [1.8.1](https://github.com/googleapis/java-shared-config/compare/v1.8.0...v1.8.1) (2024-06-24)


### Dependencies

* Update actions/checkout digest to 692973e ([#814](https://github.com/googleapis/java-shared-config/issues/814)) ([ebece6b](https://github.com/googleapis/java-shared-config/commit/ebece6b7df6208527450c12368fcc0c6ce07ac67))

## [1.8.0](https://github.com/googleapis/java-shared-config/compare/v1.7.7...v1.8.0) (2024-05-29)


### Features

* [java] allow passing libraries_bom_version from env ([#1967](https://github.com/googleapis/java-shared-config/issues/1967)) ([#825](https://github.com/googleapis/java-shared-config/issues/825)) ([07c7cec](https://github.com/googleapis/java-shared-config/commit/07c7cece6ddc793e01b108e96416750fd00c09da))
* Add `libraries_bom_version` in metadata ([#1956](https://github.com/googleapis/java-shared-config/issues/1956)) ([#805](https://github.com/googleapis/java-shared-config/issues/805)) ([a30f02d](https://github.com/googleapis/java-shared-config/commit/a30f02d78d39ee8a2a2be0fd8401a647871d10ca))
* Use maven properties to manage dependency versions for native profile ([#824](https://github.com/googleapis/java-shared-config/issues/824)) ([465bb39](https://github.com/googleapis/java-shared-config/commit/465bb399aef9aa8383f11c23f10a97df49c1d057))


### Dependencies

* Update actions/setup-node action to v4 ([#811](https://github.com/googleapis/java-shared-config/issues/811)) ([fdb1044](https://github.com/googleapis/java-shared-config/commit/fdb1044693c2175782f02a670b550e96f1c15d0b))
* Update actions/setup-node action to v4 ([#818](https://github.com/googleapis/java-shared-config/issues/818)) ([6222364](https://github.com/googleapis/java-shared-config/commit/6222364b4795661f282593b135d415827700d635))
* Update actions/setup-node action to v4 ([#819](https://github.com/googleapis/java-shared-config/issues/819)) ([ffb2a7a](https://github.com/googleapis/java-shared-config/commit/ffb2a7a3ff131a8d5af869098fdd69d0cdd87c4d))
* Update dependency com.puppycrawl.tools:checkstyle to v10.16.0 ([#816](https://github.com/googleapis/java-shared-config/issues/816)) ([efc5585](https://github.com/googleapis/java-shared-config/commit/efc5585ec817e327e0381412c2b2436e3ef0510d))
* Update dependency com.puppycrawl.tools:checkstyle to v10.17.0 ([#831](https://github.com/googleapis/java-shared-config/issues/831)) ([b0c9e75](https://github.com/googleapis/java-shared-config/commit/b0c9e75e778950401df28adb10998a676d6a24ff))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 ([#826](https://github.com/googleapis/java-shared-config/issues/826)) ([881e72f](https://github.com/googleapis/java-shared-config/commit/881e72f7e5dc1304929b89e9ec9d1ba9d4d0bead))

## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17)


Expand Down
20 changes: 10 additions & 10 deletions java-shared-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<packaging>pom</packaging>
<version>1.7.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
<version>1.8.1</version><!-- {x-version-update:google-cloud-shared-config:current} -->
<name>Google Cloud Shared Config</name>
<url>https://github.com/googleapis/java-shared-config</url>
<description>
Expand All @@ -16,7 +16,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>native-image-shared-config</artifactId>
<version>1.7.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
<version>1.8.1</version><!-- {x-version-update:google-cloud-shared-config:current} -->
<relativePath>../native-image-shared-config</relativePath>
</parent>

Expand Down Expand Up @@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -61,7 +61,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<!-- to get rid of the warning: [WARNING] Warning: killAfter is now deprecated. Do you need it ?
Please comment on MEXEC-6. see: method execute() in
Expand Down Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
Expand Down Expand Up @@ -160,7 +160,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -388,7 +388,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<reportSets>
<reportSet>
<reports>
Expand Down Expand Up @@ -456,7 +456,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
<configuration>
<linkJavadoc>true</linkJavadoc>
</configuration>
Expand Down Expand Up @@ -516,12 +516,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.15.0</version>
<version>10.17.0</version>
</dependency>
</dependencies>
<executions>
Expand Down
Loading

0 comments on commit dd8ed58

Please sign in to comment.