Skip to content

automate updating nix flakes#35641

Merged
techknowlogick merged 3 commits intogo-gitea:mainfrom
techknowlogick:automate-nix-flake-update
Feb 14, 2026
Merged

automate updating nix flakes#35641
techknowlogick merged 3 commits intogo-gitea:mainfrom
techknowlogick:automate-nix-flake-update

Conversation

@techknowlogick
Copy link
Copy Markdown
Member

@techknowlogick techknowlogick commented Oct 12, 2025

No description provided.

@techknowlogick techknowlogick requested a review from 6543 October 12, 2025 02:49
@techknowlogick techknowlogick added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. dependencies labels Oct 12, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 12, 2025
silverwind
silverwind reviewed Oct 12, 2025
View reviewed changes
@6543 6543 force-pushed the automate-nix-flake-update branch from f66214b to ca53549 Compare October 13, 2025 10:44
@6543
Copy link
Copy Markdown
Member

6543 commented Oct 13, 2025

☝️ tested gh rebase update :D

@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 13, 2025
@silverwind
Copy link
Copy Markdown
Member

silverwind commented Oct 13, 2025

Does it still need the issues: write?

@silverwind
Copy link
Copy Markdown
Member

silverwind commented Feb 14, 2026

@techknowlogick is it ready?

@techknowlogick techknowlogick merged commit 2cdf86e into go-gitea:main Feb 14, 2026
23 of 24 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Feb 14, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Feb 14, 2026

@techknowlogick

It's not the first time that I questioned you about why merging a PR with only one approval, no last call?

Last time, you have excuse that "So nothing is bypassed or skipped."

So, what's the new excuse for this time?

image image

@techknowlogick techknowlogick deleted the automate-nix-flake-update branch February 14, 2026 18:10
@techknowlogick
Copy link
Copy Markdown
Member Author

techknowlogick commented Feb 14, 2026

@wxiaoguang "enabling auto-merge" is not bypassing checks, it only merges when status checks pass, which include two approvals, and no blocking. This PR was merge using bypass-checks as I received offline approval from other maintainers away from keyboard, although TOC are able to merge PRs and bypass checks based on discretion.

@silverwind
Copy link
Copy Markdown
Member

silverwind commented Feb 14, 2026 •
edited
Loading

Does it still need the issues: write?

BTW this question is still unadressed. Can it work without issues: write? I see no reason why this should need to write to issues, only pull-requests.

@techknowlogick
Copy link
Copy Markdown
Member Author

techknowlogick commented Feb 14, 2026

@silverwind github's apis overlap between PRs and issues so that is still needed

@silverwind
Copy link
Copy Markdown
Member

silverwind commented Feb 14, 2026

Ah ok, I assumed as much.

silverwind added a commit to silverwind/gitea that referenced this pull request Feb 14, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into xfo
d5f17b4 
* origin/main: (2555 commits)
  automate updating nix flakes (go-gitea#35641)
  Update AGENTS.md instructions (go-gitea#36627)
  use user id in noreply emails (go-gitea#36550)
  feat(db): Improve BuildCaseInsensitiveLike with lowercase (go-gitea#36598)
  [skip ci] Updated translations via Crowdin
  BUG: Fix workflow run jobs API returning null steps (go-gitea#36603)
  Refactor highlight and diff (go-gitea#36599)
  Fix bug when do LFS GC (go-gitea#36500)
  feature to be able to filter project boards by milestones (go-gitea#36321)
  Update emoji data for Unicode 16 (go-gitea#36596)
  Adapt monaco error matching pattern to recent webpack config change (go-gitea#36533)
  Fix a bug user could change another user's primary email (go-gitea#36586)
  fix(repo-editor): disable Monaco `editContext` to avoid bugs with lost focus (go-gitea#36585)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  ...

# Conflicts:
#	custom/conf/app.example.ini
#	docs/content/administration/config-cheat-sheet.en-us.md
#	docs/content/administration/config-cheat-sheet.zh-cn.md
#	modules/setting/security.go
#	routers/common/errpage.go
#	services/context/api.go
#	services/context/context.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@silverwind silverwind silverwind left review comments

@6543 6543 6543 approved these changes

Assignees

No one assigned

Labels

lgtm/need 1 This PR needs approval from one additional maintainer to be merged. modifies/internal skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

5 participants

@techknowlogick @6543 @silverwind @wxiaoguang @GiteaBot