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.

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

ci: add Github Actions workflow to check convergence in a release PR #1752

Merged
merged 9 commits into from Mar 24, 2021

Conversation

Neenu1995
Copy link
Contributor

No description provided.

@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Mar 17, 2021
@@ -13,4 +13,41 @@ jobs:
with:
java-version: 8
- run: java -version
- run: .kokoro/dashboard.sh

converge:
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's be more specific here: dependency-convergence-check.

with:
java-version: 8
script: |
// only approve PRs from release-please
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// only approve PRs from release-please
// only checks PRs from release-please

return;
}

// only approve PRs like "chore: release <release version>"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// only approve PRs like "chore: release <release version>"
// only checks PRs like "chore: release <release version>"

return;
}

// only approve PRs with README.md, CHANGELOG.md, pom.xml and versions.txt changes
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// only approve PRs with README.md, CHANGELOG.md, pom.xml and versions.txt changes
// only checks PRs with README.md, CHANGELOG.md, pom.xml and versions.txt changes

RETURN_CODE=${INSTALL_RETURN_CODE}

case ${JOB_TYPE} in
converge)
Copy link
Contributor

Choose a reason for hiding this comment

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

please update this accordingly

if (files.size != 4 || !files.has("README.md") || !files.has("CHANGELOG.md") || !files.has("pom.xml") || !files.has("versions.txt")) {
return;
}
- run: java -version
- run: .kokoro/dashboard.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

if you are checking JOB_TYPE in dashboard.sh, you would need to add the env var here:

        env:
          JOB_TYPE: convergence

Comment on lines 35 to 43
CONVERGE_RETURN_CODE=$?
if [[ $INSTALL_RETURN_CODE -eq 0 ]]
then
RETURN_CODE=${CONVERGE_RETURN_CODE}
fi
;;
esac

echo "exiting with ${RETURN_CODE}"
Copy link
Contributor

Choose a reason for hiding this comment

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

This would only tell you if the report was built successfully or not (which is important) but I'm not seeing the output being checked.

Ideally, if we have full convergence, the script should exit with 0 and output Shared dependencies converge \o/. Otherwise, it should exit with error code 1 and a list of clients that are not converging (which is already being output by the report).

.github/workflows/dashboard.yaml Outdated Show resolved Hide resolved
.kokoro/dashboard.sh Outdated Show resolved Hide resolved
.kokoro/dashboard.sh Outdated Show resolved Hide resolved
.kokoro/dashboard.sh Outdated Show resolved Hide resolved
Comment on lines +44 to +47
while IFS= read -r line; do
echo "$line"
LINE_COUNT=$((LINE_COUNT+1))
done < "$outputFile"
Copy link
Collaborator

Choose a reason for hiding this comment

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

If you're just counting lines - cat "${outputFile}" | wc -l

.kokoro/dashboard.sh Show resolved Hide resolved
.kokoro/dashboard.sh Show resolved Hide resolved
@chingor13 chingor13 marked this pull request as ready for review March 23, 2021 19:44
@chingor13 chingor13 requested a review from a team as a code owner March 23, 2021 19:44
@Neenu1995 Neenu1995 added the automerge Merge the pull request once unit tests and other checks pass. label Mar 24, 2021
@gcf-merge-on-green gcf-merge-on-green bot merged commit 7e3b00e into master Mar 24, 2021
@gcf-merge-on-green gcf-merge-on-green bot deleted the convergence-ci-add branch March 24, 2021 19:34
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge the pull request once unit tests and other checks pass. label Mar 24, 2021
gcf-owl-bot bot added a commit that referenced this pull request Jan 19, 2023
…mplates/java_library/.kokoro (#1752)

build(deps): bump protobuf

Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 3.20.1 to 3.20.2.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.20.1...v3.20.2)

---
updated-dependencies:
- dependency-name: protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Source-Link: googleapis/synthtool@239f962
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:d5da32501662e4e53365220cc14cfb1d3b9446585397d57dac50171d92556ae7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants