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

chore: fix verify_library_generation.yaml for forks #2716

Merged
merged 9 commits into from
May 2, 2024
+4 −2
Merged

chore: fix verify_library_generation.yaml for forks #2716

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c18744a
chore: fix verify_library_generation.yaml for forks
alicejli May 2, 2024
6ca1445
change order of fetch
alicejli May 2, 2024
c77d781
Merge branch 'main' into fixVerify_library_generation
alicejli May 2, 2024
b456aaa
add comments
alicejli May 2, 2024
c79b468
Merge branch 'main' of https://github.com/googleapis/sdk-platform-jav…
alicejli May 2, 2024
c041eb0
Merge branch 'fixVerify_library_generation' of https://github.com/goo…
alicejli May 2, 2024
2b57c04
.
alicejli May 2, 2024
69c310a
remove extraneous files
alicejli May 2, 2024
a85b108
Update .github/workflows/verify_library_generation.yaml
alicejli May 2, 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
6 changes: 4 additions & 2 deletions .github/workflows/verify_library_generation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ jobs:
shell: bash
run: |
set -ex
git checkout "${base_ref}"
git checkout "${head_ref}"
git checkout "${base_ref}" # Checkout a detached head, and then fetch the base ref to populate the detached head.
git fetch --no-tags --prune origin +${base_ref}:refs/remotes/origin/${base_ref}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why git fetch after git checkout?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It doesn't actually matter too much for L23-L24, but it's needed for L25/26 so that it can find the forked branches. I can revert this line if preferred.

Copy link
Collaborator

Choose a reason for hiding this comment

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

If it's not actually useful, I think we should revert it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually I think we do need it. Added some comments to explain.

git checkout "${head_ref}" # Checkout a detached head, and then fetch the head ref to populate the detached head.
git fetch --no-tags --prune origin +${head_ref}:refs/remotes/origin/${head_ref}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we move this line before git checkout "${head_ref}"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added comments to explain

changed_directories="$(git diff --name-only ${base_ref} ${head_ref})"
if [[ ${changed_directories} =~ "library_generation/" ]]; then
echo "should_run=true" >> $GITHUB_OUTPUT
Expand Down
Loading