Skip to content

secure workflow #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

secure workflow #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d478009
chore: setup 2.19.x lts branch (#1535)
zhumin8 Jul 31, 2024
21d8cad
chore(main): release 2.21.0 (#1517)
release-please[bot] Aug 5, 2024
9e52395
deps: update dependency com.google.cloud:sdk-platform-java-config to …
renovate-bot Aug 6, 2024
2e39265
chore(main): release 2.21.1-SNAPSHOT (#1538)
release-please[bot] Aug 6, 2024
7bc796e
chore(deps): update dependency com.google.cloud:libraries-bom to v26.…
renovate-bot Aug 6, 2024
a9e90f3
chore(main): release 2.21.1 (#1540)
release-please[bot] Aug 6, 2024
312d55a
chore: secure hermetic build workflow
diegomarquezp Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ branches:
handleGHRelease: true
releaseType: java-backport
branch: 2.17.x
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-backport
branch: 2.19.x
16 changes: 16 additions & 0 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,22 @@ branchProtectionRules:
- 'Kokoro - Test: Java GraalVM Native Image'
- 'Kokoro - Test: Java 17 GraalVM Native Image'
- javadoc
- pattern: 2.19.x
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- dependencies (17)
- lint
- clirr
- units (8)
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- 'Kokoro - Test: Java GraalVM Native Image'
- 'Kokoro - Test: Java 17 GraalVM Native Image'
- javadoc
permissionRules:
- team: yoshi-admins
permission: admin
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/hermetic_library_generation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ name: Hermetic library generation upon generation config change through pull req
on:
pull_request:

env:
HEAD_REF: ${{ github.head_ref }}

jobs:
library_generation:
# skip pull requests coming from a forked repository
# skip pull requests come from a forked repository
if: github.event.pull_request.head.repo.full_name == github.repository
runs-on: ubuntu-latest
steps:
Expand All @@ -35,6 +38,6 @@ jobs:
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
bash .github/scripts/hermetic_library_generation.sh \
--target_branch ${{ github.base_ref }} \
--current_branch ${{ github.head_ref }}
--current_branch $HEAD_REF
env:
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
with:
bom-path: google-cloud-datastore-bom/pom.xml
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
}

env_vars: {
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06)


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1531](https://github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))

## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)


### Features

* Enable hermetic library generation ([#1462](https://github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))

## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)


Expand Down
4 changes: 2 additions & 2 deletions datastore-v1-proto-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<version>2.21.1</version><!-- {x-version-update:datastore-v1-proto-client:current} -->

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>

<packaging>jar</packaging>
Expand Down
12 changes: 6 additions & 6 deletions google-cloud-datastore-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-bom</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.32.0</version>
<version>3.33.0</version>
</parent>

<name>Google Cloud datastore BOM</name>
Expand Down Expand Up @@ -52,22 +52,22 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.111.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.112.1</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-datastore</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
<packaging>jar</packaging>
<name>Google Cloud Datastore</name>
<url>https://github.com/googleapis/java-datastore</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-datastore</site.installationModule>
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-datastore-admin-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<name>grpc-google-cloud-datastore-admin-v1</name>
<description>GRPC library for google-cloud-datastore</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<packaging>pom</packaging>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
<name>Google Cloud Datastore Parent</name>
<url>https://github.com/googleapis/java-datastore</url>
<description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.32.0</version>
<version>3.33.0</version>
</parent>

<developers>
Expand Down Expand Up @@ -159,27 +159,27 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.111.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.112.1</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.datastore</groupId>
<artifactId>datastore-v1-proto-client</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<version>2.21.1</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
<exclusions>
<exclusion>
<groupId>com.google.api.grpc</groupId>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-datastore-admin-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<version>2.21.1</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
<name>proto-google-cloud-datastore-admin-v1</name>
<description>Proto library for google-cloud-datastore</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-datastore-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-datastore-v1</artifactId>
<version>0.111.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<version>0.112.1</version><!-- {x-version-update:proto-google-cloud-datastore-v1:current} -->
<name>proto-google-cloud-datastore-v1</name>
<description>PROTO library for proto-google-cloud-datastore-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore-parent</artifactId>
<version>2.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
<version>2.21.1</version><!-- {x-version-update:google-cloud-datastore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/native-image-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.41.0</version>
<version>26.43.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/snapshot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>2.20.3-SNAPSHOT</version>
<version>2.21.1</version>
</dependency>
<!-- {x-version-update-end} -->

Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.41.0</version>
<version>26.43.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version

google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT
google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT
proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT
datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT
proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
google-cloud-datastore:2.21.1:2.21.1
google-cloud-datastore-bom:2.21.1:2.21.1
proto-google-cloud-datastore-v1:0.112.1:0.112.1
datastore-v1-proto-client:2.21.1:2.21.1
proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1
grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1
Loading