Commit Graph
804762 Commits
Author SHA1 Message Date
Wolfgang Walther e48d9d6174 workflows/get-merge-commit: move to composite action
We don't need a separate workflow anymore, because we don't need to skip
dependent jobs on failures anymore. The biggest failure mode was
"conflict" previously, but we resolved that on the last commit. The
remaining failure modes are so rare, that it's OK to just fail the jobs
in this case instead of marking them as "skipped". Especially, because
the resolve-merge-commit job would have previously failed anyway.

By moving this to an action we avoid running separate jobs each time we
need the merge commit. This also makes the check list in PRs much
cleaner.
2025-05-23 23:06:20 +02:00
Wolfgang Walther c77cfb9239 workflows: run on merge conflicts as well
When a PR is having conflicts with the base branch, we used to skip most
jobs depending on the target branch. With this change, we still run
those jobs, but without actually merging the PR temporarily. That means
we compare the head of the PR with the merge-base of the PR's branch and
the target branch - i.e. the point where the PR branched off.

This is not 100% accurate, but that's not important, because after
resolving the merge conflicts, those workflows will run again anyway. It
allows to give early feedback, though, instead of just skipping all the
jobs.
2025-05-23 23:06:18 +02:00
Wolfgang Walther 277f7b998c workflows/get-merge-commit: inline get-merge-commit.sh script as github-script
The reason this was a separate shell script was, that this would be
included in multiple workflows separately. But a while ago this had been
changed to a re-usable workflow, so we can just as well inline the
script.

This also allows us to use actions/github-script, which makes for a much
more readable script than the bash script before.
2025-05-23 23:05:26 +02:00
AleksanaandGitHub f66ede7fd3 python313Packages.tracerite: add missing dep (#409605) 2025-05-23 15:15:15 +08:00
Pol DellaieraandMasum Reza a0022b5484 presenterm: fix sixel feature support 2025-05-23 12:43:39 +05:30
AleksanaandGitHub 8821c7fba8 iconic: init at 2025.3.2 (#409756) 2025-05-23 15:09:13 +08:00
Ulrik StridandGitHub 6313641178 fluxcd-operator: 0.19.0 -> 0.20.0 (#406486) 2025-05-23 09:06:19 +02:00
Vladimír Čunát afead532b5 python3Packages.labelbox: 6.6.0 -> 6.10.0 (#407797) 2025-05-23 09:05:01 +02:00
Leona MaroniandGitHub af9aa247e0 doc/rl-2505: final cleanups (#410026) 2025-05-23 09:04:01 +02:00
2f0e77bce2 spicetify-cli: 2.40.7 -> 2.40.9 (#410055)
Co-authored-by: mdarocha <mdarocha@users.noreply.github.com>
2025-05-23 06:52:28 +00:00
R. Ryantm 6d47315045 spicetify-cli: 2.40.7 -> 2.40.9 2025-05-23 06:36:08 +00:00
Pol DellaieraandGitHub 223d5291bc mint: 0.23.2 -> 0.24.1 (#405423) 2025-05-23 06:30:04 +00:00
Pol DellaieraandGitHub f9d6766c56 ms-sys: 2.6.0 -> 2.7.0 (#405455) 2025-05-23 06:29:45 +00:00
Pol DellaieraandGitHub da1181fb2f proxypin: 1.1.8 -> 1.1.9 (#408104) 2025-05-23 06:28:34 +00:00
Pol DellaieraandGitHub 62d40312bc navicat-premium: 17.2.2 -> 17.2.3 (#407491) 2025-05-23 06:28:10 +00:00
Pol DellaieraandGitHub 920a764431 netexec: 1.3.0 -> 1.4.0 (#406349) 2025-05-23 06:27:34 +00:00
Pol DellaieraandGitHub b4b1585ef5 libndctl: 79 -> 81 (#406092) 2025-05-23 06:26:47 +00:00
Pol DellaieraandGitHub 896b2f185a netlogo: 6.1.1 -> 6.4.0 (#406370) 2025-05-23 06:26:00 +00:00
Pol DellaieraandGitHub daa3933011 cherry-studio: 1.3.4 -> 1.3.9 (#408103) 2025-05-23 06:25:41 +00:00
Doron BeharandGitHub 6c59b6c52e nixos/i18n: Re-add special handling of LANGUAGE (#409777) 2025-05-23 09:25:14 +03:00
Pol DellaieraandGitHub 1aef8b4288 intiface-central: 2.6.5 -> 2.6.7 (#408601) 2025-05-23 06:24:33 +00:00
Pol DellaieraandGitHub bb3221f222 osinfo-db-tools: 1.11.0 -> 1.12.0 (#409171) 2025-05-23 06:24:10 +00:00
Pol DellaieraandGitHub 71cf2cd69c picat: 3.6#8 -> 3.8#7 (#409519) 2025-05-23 06:23:57 +00:00
Pol DellaieraandGitHub a72cadf600 vscode-extensions.github.vscode-pull-request-github: 0.108.0 -> 0.110.0 (#409277) 2025-05-23 06:20:35 +00:00
Pol DellaieraandGitHub b84a4a5aa7 vscode-extensions.emmanuelbeziat.vscode-great-icons: 2.1.118 -> 2.1.119 (#410050) 2025-05-23 06:18:48 +00:00
Pol DellaieraandGitHub 6b2ec40ef1 pdfstudio2024: 2024.0.0 -> 2024.0.1 (#409228) 2025-05-23 06:18:35 +00:00
Pol DellaieraandGitHub 419bb9f6ef pandoc-plantuml-filter: 0.1.2 -> 0.1.5 (#409189) 2025-05-23 06:18:20 +00:00
Doron BeharandGitHub 341ff9bfc1 gnome-network-displays: 0.96.0 -> 0.97.0 (#409977) 2025-05-23 09:17:31 +03:00
Doron Behar 82dfbe95f5 nixos/i18n: Re-add special handling of LANGUAGE
This reverts commit 263297b4e5 while also
explaining in the docs where exactly LANGUAGE is ignored, and why.

Fixes #409306.
2025-05-23 09:13:29 +03:00
5a4399c60d blackfire: 2.28.23 -> 2.28.24 (#410034)
Co-authored-by: shyim <github@shyim.de>
2025-05-23 05:57:56 +00:00
f62af1166d shopware-cli: 0.5.20 -> 0.6.1 (#409906)
Co-authored-by: shyim <github@shyim.de>
2025-05-23 05:57:19 +00:00
R. Ryantm a05da0eba7 vscode-extensions.emmanuelbeziat.vscode-great-icons: 2.1.118 -> 2.1.119 2025-05-23 05:53:19 +00:00
d1ab552b88 zashboard: 1.83.0 -> 1.90.0 (#410039)
Co-authored-by: emaryn <emaryn@users.noreply.github.com>
2025-05-23 05:19:58 +00:00
Pol DellaieraandGitHub f0527b2021 python3Packages.langgraph-checkpoint: cleanup (#409926) 2025-05-23 05:08:34 +00:00
R. Ryantm ef1265b302 zashboard: 1.83.0 -> 1.90.0 2025-05-23 04:53:50 +00:00
c9b1eb70c6 argon: 2.0.23 -> 2.0.24 (#409965)
Co-authored-by: StayBlue <blue@spook.rip>
2025-05-23 04:52:28 +00:00
emaryn f0fe68a3c5 iconic: init at 2025.3.2 2025-05-23 12:39:42 +08:00
R. Ryantm 78304087ee blackfire: 2.28.23 -> 2.28.24 2025-05-23 04:33:02 +00:00
Seth Flynn 7fb7f0c4a1 nixos/doc/rl-2505: cleanup "new modules" section 2025-05-22 23:53:14 -04:00
Seth Flynn b17e45ca7c doc/rl-2505: fix nexusmods.app entry formatting
I don't really think this needs its own header and section...
2025-05-22 23:53:08 -04:00
Seth Flynn 00ae244074 doc/rl-2505: move unrelated entries from lib section 2025-05-22 23:43:01 -04:00
Seth Flynn 041c3794c4 doc/rl-2505: fix links in lib section 2025-05-22 23:43:00 -04:00
AleksanaandGitHub 5fd725ebdf pmars: Fix FTBFS due to ncurses change (#405380) 2025-05-23 11:35:29 +08:00
PopandGitHub 017276a4aa netbird: fix typo in warning message (#406819) 2025-05-23 11:32:04 +08:00
AleksanaandGitHub 813b891a78 anytype: fix single instance detection and specify URL in .desktop file (#409868) 2025-05-23 11:30:58 +08:00
AleksanaandGitHub fcd89b619d nixos/foot: fix zshrc (#393899) 2025-05-23 11:26:54 +08:00
AleksanaandGitHub 7bbf222633 catppuccin-plymouth: fix variant selection (#407409) 2025-05-23 11:20:16 +08:00
AleksanaandGitHub 62292dce08 akkoma-admin-fe: Fix build for x86_64-darwin (#408346) 2025-05-23 11:18:43 +08:00
AleksanaandGitHub b2a23fdba0 ulauncher: revert back to webkitgtk_4_0 to fix startup error (#409640) 2025-05-23 11:15:35 +08:00
AleksanaandGitHub c48ed52005 llvmPackages.lldb-manpages: fix building (#409958) 2025-05-23 11:15:03 +08:00