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

bump protobuf module #29617

Merged
merged 1 commit into from
Mar 6, 2024
Merged

bump protobuf module #29617

merged 1 commit into from
Mar 6, 2024

Conversation

techknowlogick
Copy link
Member

No description provided.

@techknowlogick techknowlogick added type/dependency-update backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 5, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 5, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 5, 2024
@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 Mar 6, 2024
@silverwind
Copy link
Member

silverwind commented Mar 6, 2024 •
edited
Loading

The problem is the setup-go which installs 1.21.7 while 1.21.8 is available, specifically this repo. So we may need to bypass CI checks until setup-go is fixed.

@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 Mar 6, 2024
@silverwind
Copy link
Member

Upstream issue: actions/setup-go#462

@techknowlogick techknowlogick enabled auto-merge (squash) March 6, 2024 01:35
@techknowlogick techknowlogick merged commit 06039bf into go-gitea:main Mar 6, 2024
25 of 26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 6, 2024
@techknowlogick techknowlogick deleted the bump-protobuf branch March 6, 2024 01:35
@GiteaBot
Copy link
Contributor

GiteaBot commented Mar 6, 2024

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

go run ./contrib/backport 29617
...  // 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 Mar 6, 2024
techknowlogick added a commit to techknowlogick/gitea that referenced this pull request Mar 6, 2024
@techknowlogick
bump protobuf module (go-gitea#29617)
62ac91b
@techknowlogick techknowlogick mentioned this pull request Mar 6, 2024
Merged
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 6, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
810335f 
* giteaofficial/main:
  Run editorconfig-checker on `locale_en-US.ini` (go-gitea#29608)
  bump protobuf module (go-gitea#29617)
  Add ac claim for old docker/build-push-action@v3 / current buildx gha cache (go-gitea#29584)
  Skip email domain check when admins edit user emails (go-gitea#29609)
  Improve natural sort (go-gitea#29611)
  Add empty repo check in `DetectAndHandleSchedules` (go-gitea#29606)
  Fix contributor graphs mobile layout and responsiveness (go-gitea#29597)
  Skip email domain check when admin users adds user manually (go-gitea#29522)
  Replace more `gt-` with `tw-`, update frontend docs (go-gitea#29595)
  Remove unnecessary ctxData for "attachments" template (go-gitea#29600)
  Adjust tailwind content globs (go-gitea#29596)
  Use flex wrap to layout the PR update button (go-gitea#29590)
  Make "/user/login" page redirect if the current user has signed in (go-gitea#29583)
  [skip ci] Updated translations via Crowdin
  Fix projects mode bugs (go-gitea#29593)
  Regenerate fomantic lockfile and build it with our browserslist (go-gitea#29560)
  Do not exceed display for the PR page buttons on smaller screens (go-gitea#29418)
  Add aria-label to the navbar menu button (go-gitea#29587)
lunny pushed a commit that referenced this pull request Mar 6, 2024
@techknowlogick
bump protobuf module (#29617) (#29619)
a8277cf 
backport #29617
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 6, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into overflow-menu
de5074c 
* origin/main: (29 commits)
  Tweak actions color and borders (go-gitea#29640)
  Add download URL for executable files (go-gitea#28260)
  Move all login and account creation page labels to be above inputs (go-gitea#29432)
  Avoid issue info panic (go-gitea#29625)
  Cache repository default branch commit status to reduce query on commit status table (go-gitea#29444)
  Avoid unexpected panic in graceful manager (go-gitea#29629)
  Add a link for the recently pushed branch notification (go-gitea#29627)
  Fix wrong header of org project view page (go-gitea#29626)
  Detect broken git hooks (go-gitea#29494)
  Sync branches to DB immediately when handle git hook calling (go-gitea#29493)
  Fix wrong line number in code search result (go-gitea#29260)
  Make wiki default branch name changable (go-gitea#29603)
  A small refactor for agit implementation (go-gitea#29614)
  Update Twitter Logo (go-gitea#29621)
  Fix 500 error when adding PR comment (go-gitea#29622)
  Run editorconfig-checker on `locale_en-US.ini` (go-gitea#29608)
  bump protobuf module (go-gitea#29617)
  Add ac claim for old docker/build-push-action@v3 / current buildx gha cache (go-gitea#29584)
  Skip email domain check when admins edit user emails (go-gitea#29609)
  Improve natural sort (go-gitea#29611)
  ...
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 8, 2024
@lunny lunny added the backport/done All backports for this PR have been created label Mar 13, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@silverwind silverwind silverwind 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.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@techknowlogick @silverwind @GiteaBot @delvh @lunny