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

[release/2.8 backport] update to go1.19.9 #3908

Merged
merged 3 commits into from
May 9, 2023
Merged

[release/2.8 backport] update to go1.19.9 #3908

merged 3 commits into from
May 9, 2023

Conversation

thaJeztah
Copy link
Member

Added back minor versions in these, so that we have a somewhat more reproducible state in the repository when tagging releases.

@thaJeztah
Copy link
Member Author

opening as draft, because the PR on master will get a different commit-sha, but opening already to verify if this works in this branch without updating golangci-lint (and without adding the linting fixes)

@milosgajdos
Copy link
Member

I think this build is stuck...GH is having one of those days unfortunately....

@thaJeztah
Copy link
Member Author

Let me try a force push

@thaJeztah thaJeztah force-pushed the 2.8_backport_bump_go1.19.9 branch 2 times, most recently from 54b0e02 to 3263a09 Compare May 9, 2023 15:35
@thaJeztah
Copy link
Member Author

Never know if this is just "be patient; I'm doing something but not showing you" or something actually stuck;

2023-05-09T15:35:21.1959136Z Requested labels: ubuntu-latest
2023-05-09T15:35:21.1959359Z Job defined at: distribution/distribution/.github/workflows/ci.yml@refs/pull/3908/merge
2023-05-09T15:35:21.1959469Z Waiting for a runner to pick up this job...
2023-05-09T15:35:21.4044385Z Job is waiting for a hosted runner to come online.
2023-05-09T15:35:24.4194758Z Job is about to start running on the hosted runner: GitHub Actions 11 (hosted)

@milosgajdos
Copy link
Member

milosgajdos commented May 9, 2023 •
edited
Loading

This is failing linter @thaJeztah

Error: registry/storage/driver/testsuites/testsuites.go:8:2: SA1019: "io/ioutil" has been deprecated since Go 1.16: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)
	"io/ioutil"
	^
Error: testutil/handler.go:7:2: SA1019: "io/ioutil" has been deprecated since Go 1.16: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)
	"io/ioutil"
	^
Error: configuration/configuration.go:7:2: SA1019: "io/ioutil" has been deprecated since Go 1.16: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)

@thaJeztah
Copy link
Member Author

Ah! Yes, I was somewhat expecting that one.

Let me see if we can add a global exclusion for that one. While it's "good" to replace it, the original one won't go away before Go v2, so I think it's safe to ignore it for the v2.8 branch

@thaJeztah
[release/2.8] ignore deprecation of io/ioutil
9c04409 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
update to go1.19.9
3f2a4e2 
Added back minor versions in these, so that we have a somewhat more
reproducible state in the repository when tagging releases.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 322eb4e)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 2.8_backport_bump_go1.19.9 branch from 3263a09 to 3f2a4e2 Compare May 9, 2023 15:58
thaJeztah
thaJeztah commented May 9, 2023
View reviewed changes
.golangci.yml
Comment on lines +21 to +27

issues:
exclude-rules:
# io/ioutil is deprecated, but won't be removed until Go v2. It's safe to ignore for the release/2.8 branch.
- text: "SA1019: \"io/ioutil\" has been deprecated since Go 1.16"
linters:
- staticcheck
Copy link
Member Author

Choose a reason for hiding this comment

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

Try if this works (I never know the right format for these so 🤞)

@thaJeztah thaJeztah marked this pull request as ready for review May 9, 2023 16:09
@milosgajdos
Copy link
Member

milosgajdos commented May 9, 2023 •
edited
Loading

Last two bits @thaJeztah 😄

version/print.go:12: File is not `gofmt`-ed with `-s` (gofmt)
// 	<cmd> <project> <version>
reference/reference.go:6: File is not `gofmt`-ed with `-s` (gofmt)
// 	reference                       := name [ ":" tag ] [ "@" digest ]
registry/auth/auth.go:11: File is not `gofmt`-ed with `-s` (gofmt)
//		options := map[string]interface{}{"sillySecret": "whysosilly?"}
// 		accessController, _ := auth.GetAccessController("silly", options)

@milosgajdos
Fix gofmt warnings
ae58bde 
Signed-off-by: Milos Gajdos <[email protected]>
@milosgajdos
Copy link
Member

PTAL @squizzi @corhere @wy65701436

@milosgajdos milosgajdos merged commit 4a35c45 into distribution:release/2.8 May 9, 2023
@milosgajdos milosgajdos mentioned this pull request May 9, 2023
Closed
@thaJeztah thaJeztah deleted the 2.8_backport_bump_go1.19.9 branch May 9, 2023 18:32
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Jul 29, 2023
@nrdufour
chore(deps): update registry docker tag to v2.8.2 (#20)
fa04a41 
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [registry](https://github.com/distribution/distribution) | patch | `2.8.1` -> `2.8.2` |

---

### Release Notes

<details>
<summary>distribution/distribution (registry)</summary>

### [`v2.8.2`](https://github.com/distribution/distribution/releases/tag/v2.8.2)

[Compare Source](distribution/distribution@v2.8.1...v2.8.2)

##### What's Changed

-   Revert registry/client: set `Accept: identity` header when getting layers by [@&#8203;ndeloof](https://github.com/ndeloof) in distribution/distribution#3783
-   Parse `http` forbidden as denied by [@&#8203;vvoland](https://github.com/vvoland) in distribution/distribution#3914
-   Fix [CVE-2022-28391](https://www.cve.org/CVERecord?id=CVE-2022-28391) by bumping alpine from 3.14 to 3.16 by [@&#8203;thaJeztah](https://github.com/thaJeztah) ([#&#8203;3650](distribution/distribution#3650))
-   Fix [CVE-2023-2253](https://www.cve.org/CVERecord?id=CVE-2023-2253) runaway allocation on /v2/\_catalog  by [@&#8203;josegomezr](https://github.com/josegomezr) [`521ea3d9`](distribution/distribution@521ea3d)
-   Fix panic in inmemory driver by [@&#8203;wy65701436](https://github.com/wy65701436) in distribution/distribution#3815
-   bump up golang version (alternative) by [@&#8203;thaJeztah](https://github.com/thaJeztah) in distribution/distribution#3903
-   Dockerfile: update xx to v1.2.1 by [@&#8203;thaJeztah](https://github.com/thaJeztah) in distribution/distribution#3907
-   update to go1.19.9 by [@&#8203;thaJeztah](https://github.com/thaJeztah) in distribution/distribution#3908
-   Add code to handle pagination of parts. Fixes max layer size of 10GB bug by [@&#8203;DavidSpek](https://github.com/DavidSpek) in distribution/distribution#3893
-   Dockerfile: fix filenames of artifacts by [@&#8203;thaJeztah](https://github.com/thaJeztah) in distribution/distribution#3911

**Full Changelog**: distribution/distribution@v2.8.1...v2.8.2

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yMy4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjMuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/20
Co-authored-by: Renovate <[email protected]>
Co-committed-by: Renovate <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@milosgajdos milosgajdos milosgajdos approved these changes

@corhere corhere corhere approved these changes

@wy65701436 wy65701436 Awaiting requested review from wy65701436

@squizzi squizzi Awaiting requested review from squizzi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @milosgajdos @corhere