Skip to content
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

Jump to bottom

build: add kokoro & ci configs to 1.106.1-patch branch #847

Merged
merged 8 commits into from
Jun 10, 2021
Merged

build: add kokoro & ci configs to 1.106.1-patch branch #847

merged 8 commits into from
Jun 10, 2021

Conversation

danielduhh
Copy link
Contributor

@danielduhh danielduhh commented May 26, 2021 •
edited
Loading

This adds update kokoro and ci configs to the 1.106.1-patch branch in prep for a patch release.

Required for: #844

@product-auto-label product-auto-label bot added the api: storage Issues related to the googleapis/java-storage API. label May 26, 2021
@generated-files-bot
Copy link

generated-files-bot bot commented May 26, 2021 •
edited
Loading

Warning: This pull request is touching the following templated files:

  • .github/CODEOWNERS
  • .github/blunderbuss.yml
  • .github/generated-files-bot.yml
  • .github/readme/synth.py
  • .github/release-please.yml
  • .github/sync-repo-settings.yaml
  • .github/workflows/approve-readme.yaml
  • .github/workflows/auto-release.yaml
  • .github/workflows/ci.yaml
  • .kokoro/build.bat
  • .kokoro/build.sh
  • .kokoro/common.sh
  • .kokoro/continuous/readme.cfg
  • .kokoro/dependencies.sh
  • .kokoro/nightly/samples.cfg
  • .kokoro/populate-secrets.sh
  • .kokoro/presubmit/samples.cfg
  • .kokoro/readme.sh
  • .kokoro/release/publish_javadoc.cfg
  • .kokoro/release/publish_javadoc.sh
  • .kokoro/release/publish_javadoc11.cfg
  • .kokoro/release/publish_javadoc11.sh
  • .kokoro/release/snapshot.sh
  • .kokoro/release/stage.cfg
  • .kokoro/release/stage.sh
  • .kokoro/trampoline.sh

@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label May 26, 2021
@danielduhh danielduhh mentioned this pull request May 26, 2021
Merged
@snippet-bot
Copy link

snippet-bot bot commented May 26, 2021 •
edited
Loading

Here is the summary of changes.

You are about to add 3 region tags.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

BenWhitehead and others added 2 commits May 26, 2021 19:02
@BenWhitehead
build: pin fmt-maven-plugin version to 2.9
6459701 
fmt-maven-plugin v2.10 is compiled for java 11, v2.9 is compiled for java 8

port of fix from googleapis/java-shared-config#90
@danielduhh
remove samples directory & ci
22f628a
@danielduhh
Copy link
Contributor Author

#862 should remove the linkage-monitor check @BenWhitehead

@danielduhh danielduhh changed the base branch from 1.106.1 to 1.106.1-patch June 8, 2021 22:41
@danielduhh danielduhh changed the title build: add kokoro & ci configs to 1.106.1 branch build: add kokoro & ci configs to 1.106.1-patch branch Jun 8, 2021
@danielduhh
Copy link
Contributor Author

This is ready to go @BenWhitehead @frankyn. I've added the Kokoro integration & passed the tests.

@frankyn frankyn added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jun 9, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jun 9, 2021
frankyn
frankyn suggested changes Jun 9, 2021
View reviewed changes
.kokoro/build.bat
@@ -1,3 +1,3 @@
:: See documentation in type-shell-output.bat

"C:\Program Files\Git\bin\bash.exe" github/java-storage/.kokoro/build.sh
"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an expected changed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The kokoro changes are a result of the old branch (mar 2020) being out of date with the latest config

.kokoro/continuous/readme.cfg
@@ -0,0 +1,55 @@
# Copyright 2020 Google LLC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New files should have 2021 year.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a copy of what the Kokoro config file looks like now

frankyn
frankyn reviewed Jun 9, 2021
View reviewed changes
pom.xml
<plugins>
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed this: You don't need to include this plugin into pom.xml.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ben added this in 6459701 to fix a UnsupportedClassVersionError issue

frankyn
frankyn approved these changes Jun 10, 2021
View reviewed changes
Copy link
Contributor

@frankyn frankyn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes are super subtle. Thanks for addressing my concerns, LGTM

@danielduhh danielduhh mentioned this pull request Jun 10, 2021
Closed
@danielduhh danielduhh merged commit 0ac1292 into googleapis:1.106.1-patch Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frankyn frankyn frankyn approved these changes

@BenWhitehead BenWhitehead Awaiting requested review from BenWhitehead

Assignees
No one assigned
Labels
api: storage Issues related to the googleapis/java-storage API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@danielduhh @frankyn @yoshi-kokoro @BenWhitehead