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

change master to main in scripts and docs #1569

Merged
merged 2 commits into from
Feb 8, 2023
Merged

change master to main in scripts and docs #1569

merged 2 commits into from
Feb 8, 2023

Conversation

cdrage
Copy link
Member

@cdrage cdrage commented Feb 6, 2023

change master to main in scripts and docs

Changes the naming from master to main in the scripts and documentation.

Do not merge unless CI passes!

Signed-off-by: Charlie Drage charlie@charliedrage.com

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 6, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 6, 2023
@cdrage
Copy link
Member Author

cdrage commented Feb 8, 2023

@AhmedGrati I am also disabling 1.18 since staticcheck no longer works with 1.18 with the GitHub actions: https://github.com/dominikh/staticcheck-action

I've also set a specific version for statticcheck to use 2023.1 due to the issues we keep having with CI regarding it.

@AhmedGrati
Copy link
Contributor

I think that issues still persist even if we disable staticcheck

@cdrage
Copy link
Member Author

cdrage commented Feb 8, 2023

I think that issues still persist even if we disable staticcheck

Oooff, see any way to fix it?

@AhmedGrati
Copy link
Contributor

In the Makefile -> validate, if you remove staticcheck I think it works. Can you try it?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2023
@cdrage
Copy link
Member Author

cdrage commented Feb 8, 2023

In the Makefile -> validate, if you remove staticcheck I think it works. Can you try it?

Yeah, statticcheck IMO is causing too many problems at the moment. So I'll go ahead and change it.

@cdrage
change master to main in scripts and docs
d11b66a 
Changes the naming from master to main in the scripts and documentation.

Do not merge unless CI passes!

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2023
@AhmedGrati
Copy link
Contributor

AhmedGrati commented Feb 8, 2023 •
edited
Loading

@cdrage In our code, we have two packages that require Go with version 1.19, but our CI runs on bot 1.18 and 1.19, so it fails on the 1.18 version.

@cdrage cdrage force-pushed the update-scripts-3 branch 2 times, most recently from 3efbb10 to f48356e Compare February 8, 2023 20:17
@AhmedGrati
Copy link
Contributor

Do we really need this go install honnef.co/go/tools/cmd/staticcheck@2023.1?

@cdrage
Copy link
Member Author

cdrage commented Feb 8, 2023

@AhmedGrati with this PR I'm also going to fix CI and just rip statticcheck out. Looks like CI is passing now!

AhmedGrati
AhmedGrati approved these changes Feb 8, 2023
View reviewed changes
Copy link
Contributor

@AhmedGrati AhmedGrati left a comment

Choose a reason for hiding this comment

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

LGTM

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AhmedGrati, cdrage

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

@cdrage cdrage merged commit d43aefd into kubernetes:main Feb 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AhmedGrati AhmedGrati AhmedGrati approved these changes

@kadel kadel Awaiting requested review from kadel

Assignees
No one assigned
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cdrage @AhmedGrati @k8s-ci-robot