Skip to content

bump go-deps (#27489) #27493

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.

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

Merged
merged 3 commits into from
Oct 8, 2023
Merged

Conversation

GiteaBot
Copy link
Collaborator

@GiteaBot GiteaBot commented Oct 7, 2023

Backport #27489 by @techknowlogick

@GiteaBot GiteaBot added dependencies skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Oct 7, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Oct 7, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 7, 2023
@GiteaBot GiteaBot requested review from delvh and lunny October 7, 2023 05:55
@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 Oct 7, 2023
@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 Oct 7, 2023
@silverwind silverwind enabled auto-merge (squash) October 7, 2023 09:26
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 7, 2023
@silverwind
Copy link
Member

@techknowlogick failure related to go-cron update?

--- FAIL: TestAddTaskToScheduler (0.00s)
    tasks_test.go:38: 
        	Error Trace:	/home/runner/work/gitea/gitea/services/cron/tasks_test.go:38
        	Error:      	Not equal: 
        	            	expected: "task 2"
        	            	actual  : "task 1"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-task 2
        	            	+task 1
        	Test:       	TestAddTaskToScheduler
    tasks_test.go:39: 
        	Error Trace:	/home/runner/work/gitea/gitea/services/cron/tasks_test.go:39
        	Error:      	Not equal: 
        	            	expected: "30 5 4 * * *"
        	            	actual  : "5 4 * * *"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-30 5 4 * * *
        	            	+5 4 * * *
        	Test:       	TestAddTaskToScheduler

@silverwind silverwind disabled auto-merge October 7, 2023 11:57
@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 7, 2023
@silverwind
Copy link
Member

#27511 may fix it.

@techknowlogick
Copy link
Member

@silverwind thanks for the PR, are you able to push your cron changes directly to this PR? (If not I can in a few hours)

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 7, 2023
@silverwind silverwind enabled auto-merge (squash) October 7, 2023 23:29
@silverwind
Copy link
Member

Pushed the downgrade.

@techknowlogick
Copy link
Member

Thanks @silverwind 🙏

@silverwind silverwind merged commit 8e1ef57 into go-gitea:release/v1.21 Oct 8, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 8, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants