Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

upgrade go-crypto from 1.1.5 to 1.1.6 #33745

Merged
merged 3 commits into from
Feb 28, 2025
Merged

upgrade go-crypto from 1.1.5 to 1.1.6 #33745

merged 3 commits into from
Feb 28, 2025

Conversation

lunny
Copy link
Member

@lunny lunny commented Feb 27, 2025

Fix #33296

@lunny lunny added the backport/v1.23 This PR should be backported to Gitea 1.23 label Feb 27, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 27, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 27, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 27, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 27, 2025
@wxiaoguang
Copy link
Contributor

FYI: #33655 (comment)

@silverwind
Copy link
Member

silverwind commented Feb 28, 2025 •
edited
Loading

FYI: #33655 (comment)

Maybe we should just run licence generation with static GOOS=linux.

@silverwind
Copy link
Member

FYI: #33655 (comment)

Maybe we should just run licence generation with static GOOS=linux.

Trying this in #33727 because that PR seems to consistenly fail at the license generation.

@wxiaoguang
Copy link
Contributor

FYI: #33655 (comment)

Maybe we should just run licence generation with static GOOS=linux.

Trying this in #33727 because that PR seems to consistenly fail at the license generation.

Adding GOOS=linux might resolve this PR's problem, but it is not related to #33727. #33727 fails due to panic: lstat .go-licenses: no such file or directory, but not the license content.

@silverwind
Copy link
Member

silverwind commented Feb 28, 2025 •
edited
Loading

Yes, seems like google/go-licenses is currently broken, #33747 will workaround it by disabling it during tidy.

panic: lstat .go-licenses: no such file or directory basically means go-licenses did not produce its output directory.

@silverwind
Copy link
Member

silverwind commented Feb 28, 2025 •
edited
Loading

@lunny please remove the change in assets/go-licenses.json.

Edit: I'm actually not sure, build has passed so might be good to go.

@silverwind silverwind mentioned this pull request Feb 28, 2025
Merged
@wxiaoguang wxiaoguang enabled auto-merge (squash) February 28, 2025 13:56
@wxiaoguang wxiaoguang merged commit ae4a3d7 into go-gitea:main Feb 28, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Feb 28, 2025
@wxiaoguang wxiaoguang deleted the lunny/upgrade_crypto branch February 28, 2025 14:31
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.23. @lunny, please send one manually. 🍵

go run ./contrib/backport 33745
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 28, 2025
lunny added a commit to lunny/gitea that referenced this pull request Feb 28, 2025
@lunny @wxiaoguang
upgrade go-crypto from 1.1.5 to 1.1.6 (go-gitea#33745)
579e138 
Fix go-gitea#33296

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@lunny lunny mentioned this pull request Feb 28, 2025
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Feb 28, 2025
techknowlogick pushed a commit that referenced this pull request Mar 1, 2025
@lunny
upgrade go-crypto from 1.1.4 to 1.1.6 (#33745) (#33754)
7307422
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 3, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
acf52c7 
* giteaofficial/main:
  Use pullrequestlist instead of []*pullrequest (go-gitea#33765)
  Upgrade act to 0.261.4 and actions-proto-go to v0.4.1 (go-gitea#33760)
  Webhook add X-Gitea-Hook-Installation-Target-Type Header (go-gitea#33752)
  Fix dynamic content loading init problem (go-gitea#33748)
  [skip ci] Updated translations via Crowdin
  Add composor source field (go-gitea#33502)
  upgrade go-crypto from 1.1.5 to 1.1.6 (go-gitea#33745)
  Disable go license generation as part of `make tidy` (go-gitea#33747)
  Refactor repo-diff.ts (go-gitea#33746)
  Use `git diff-tree` for `DiffFileTree` on diff pages (go-gitea#33514)
  [skip ci] Updated translations via Crowdin
  Improve "generate new access token" form (go-gitea#33730)
  Remove superflous tw-content-center (go-gitea#33741)
  Clone repository with Tea CLI (go-gitea#33725)
  allow filtering /repos/{owner}/{repo}/pulls by target base branch queryparam (go-gitea#33684)
  Show info about maintainers are allowed to edit a PR (go-gitea#33738)
  Improve admin user view page (go-gitea#33735)
  [skip ci] Updated translations via Crowdin
  Align sidebar gears to the right (go-gitea#33721)
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/internal size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Rocky Linux 9 (Fedora 34) cannot recognize the signature added by Gitea
6 participants
@lunny @wxiaoguang @silverwind @GiteaBot @techknowlogick @delvh