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

🌱 Align github actions with upstream CAPI #2167

Merged
merged 1 commit into from
Aug 9, 2023
Merged

🌱 Align github actions with upstream CAPI #2167

merged 1 commit into from
Aug 9, 2023

Conversation

killianmuldoon
Copy link
Contributor

Aligns the github actions used in this repo with those used in upstream Cluster API c/f https://github.com/kubernetes-sigs/cluster-api/tree/main/.github/workflows

Fixes #2059

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 4, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 4, 2023
killianmuldoon
killianmuldoon commented Aug 4, 2023
View reviewed changes
Copy link
Contributor Author

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

I didn't include the make generate and make modules dependabot action in this PR as I'm not sure it's needed at all in CAPV. We can add it later if we have the same problem we saw in upstream CAPI.

.github/workflows/pr-md-link-check.yaml Show resolved Hide resolved
@sbueringer sbueringer mentioned this pull request Aug 7, 2023
Closed
7 tasks
sbueringer
sbueringer reviewed Aug 8, 2023
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Thx!

Looks good to me +/- the rebase. As I wrote. Fine for me to take another look at the dependabot.yml in a separate PR

.github/dependabot.yml Show resolved Hide resolved
@killianmuldoon
Align github actions with upstream CAPI
b275a24 
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@sbueringer
Copy link
Member

Thank you!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 9, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 894714730c1cda926da112d816e87905b7c748ab

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2023
@k8s-ci-robot k8s-ci-robot merged commit 93d4f68 into kubernetes-sigs:main Aug 9, 2023
5 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Aug 9, 2023
@sbueringer
Copy link
Member

/cherry-pick release-1.8

@sbueringer
Copy link
Member

/cherry-pick release-1.7

@sbueringer
Copy link
Member

/cherry-pick release-1.6

@sbueringer
Copy link
Member

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #2167 failed to apply on top of branch "release-1.8":

Applying: Align github actions with upstream CAPI
Using index info to reconstruct a base tree...
M	.github/dependabot.yml
A	.github/workflows/golangci-lint.yaml
A	.github/workflows/scan.yaml
A	.github/workflows/verify-pr.yml
M	Makefile
M	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
Auto-merging docs/release/release-tasks.md
CONFLICT (content): Merge conflict in docs/release/release-tasks.md
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .github/workflows/weekly-test-release.yaml
Auto-merging .github/workflows/weekly-test-release.yaml
CONFLICT (rename/delete): .github/workflows/scan.yaml deleted in HEAD and renamed to .github/workflows/weekly-image-scan.yaml in Align github actions with upstream CAPI. Version Align github actions with upstream CAPI of .github/workflows/weekly-image-scan.yaml left in tree.
Auto-merging .github/workflows/pr-verify.yaml
Auto-merging .github/workflows/pr-golangci-lint.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Align github actions with upstream CAPI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #2167 failed to apply on top of branch "release-1.7":

Applying: Align github actions with upstream CAPI
Using index info to reconstruct a base tree...
M	.github/workflows/golangci-lint.yaml
M	.github/workflows/scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Align github actions with upstream CAPI. Version Align github actions with upstream CAPI of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
Auto-merging .github/workflows/weekly-image-scan.yaml
CONFLICT (content): Merge conflict in .github/workflows/weekly-image-scan.yaml
Auto-merging .github/workflows/pr-golangci-lint.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Align github actions with upstream CAPI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #2167 failed to apply on top of branch "release-1.6":

Applying: Align github actions with upstream CAPI
Using index info to reconstruct a base tree...
M	.github/dependabot.yml
M	.github/workflows/golangci-lint.yaml
M	.github/workflows/scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Align github actions with upstream CAPI. Version Align github actions with upstream CAPI of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
Auto-merging .github/workflows/weekly-image-scan.yaml
CONFLICT (content): Merge conflict in .github/workflows/weekly-image-scan.yaml
Auto-merging .github/workflows/pr-golangci-lint.yaml
Auto-merging .github/dependabot.yml
CONFLICT (content): Merge conflict in .github/dependabot.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Align github actions with upstream CAPI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #2167 failed to apply on top of branch "release-1.5":

Applying: Align github actions with upstream CAPI
Using index info to reconstruct a base tree...
A	.github/dependabot.yml
M	.github/workflows/golangci-lint.yaml
M	.github/workflows/scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Align github actions with upstream CAPI. Version Align github actions with upstream CAPI of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
Auto-merging .github/workflows/weekly-image-scan.yaml
CONFLICT (content): Merge conflict in .github/workflows/weekly-image-scan.yaml
Auto-merging .github/workflows/pr-golangci-lint.yaml
CONFLICT (modify/delete): .github/dependabot.yml deleted in HEAD and modified in Align github actions with upstream CAPI. Version Align github actions with upstream CAPI of .github/dependabot.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Align github actions with upstream CAPI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@killianmuldoon killianmuldoon mentioned this pull request Aug 15, 2023
Closed
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
0d9b88b 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
ddf7a5e 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
38ff53b 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@killianmuldoon @chrischdi
Grouped CI related cherry-picks
008d6b9 
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
This was referenced Aug 15, 2023
Merged
Merged
Merged
Merged
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@killianmuldoon @chrischdi
Grouped CI related cherry-picks
7909e05 
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
6f9dbf8 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
3dee688 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
70fb337 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
c981142 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
4b5d459 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
1e56730 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
53365cf 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 16, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
e3625da 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 16, 2023
@lubronzhan @chrischdi
Grouped CI related cherry-picks
9ea224c 
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@srm09 srm09 Awaiting requested review from srm09

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

Compare GitHub actions with core CAPI
4 participants
@killianmuldoon @sbueringer @k8s-ci-robot @k8s-infra-cherrypick-robot