Skip to content

[24.11]: Backport scheduled workflows#378508

Merged
wolfgangwalther merged 13 commits intoNixOS:release-24.11from
wolfgangwalther:backport-scheduled-workflows
Feb 1, 2025
Merged

[24.11]: Backport scheduled workflows#378508
wolfgangwalther merged 13 commits intoNixOS:release-24.11from
wolfgangwalther:backport-scheduled-workflows

Conversation

@wolfgangwalther
Copy link
Contributor

Functionally, this is not required to be backported. But:

Things done

git diff master -- .github/workflows ci on this branch only returns diff for the OWNERS file now, nothing else anymore.


Add a 👍 reaction to pull requests you find important.

wegank and others added 13 commits February 1, 2025 11:41
(cherry picked from commit f5e3261)
Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See NixOS#361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.

(cherry picked from commit f9f5325)
Lock the Ubuntu runner to ubuntu-22.04 to avoid accidental updates [1]
and increase reproducibility.

[1]: actions/runner-images#10636

(cherry picked from commit 2660dd1)
Same top-level ordering of keys / empty lines and same indentation for
yaml lists. One blank line between each step.

Makes it easier to read and compare the workflows.

(cherry picked from commit 88afad8)
Less repetition, more consistency.

(cherry picked from commit 51b8ad2)
Apparently the skipping needs to happen on the calling workflow,
otherwise those workflows show up as "failed" in forks instead of
skipped.

(cherry picked from commit d725592)
Apparently since we are callling a reusable workflow here, we need to explicitly pass the secrets. :(

(cherry picked from commit 38ebbf7)
As per NixOS/org#54, new variables are now NIXPKGS_CI_APP_ID and NIXPKGS_CI_APP_PRIVATE_KEY.

(cherry picked from commit f697628)
(cherry picked from commit 668d72c)
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1811194#tabs-inputs

(cherry picked from commit d51aeeb)
@github-actions github-actions bot added 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Feb 1, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 1, 2025
@wolfgangwalther
Copy link
Contributor Author

Check-cherry-picks fails because some of the commits were partly backported already, so many lines missing from the new diff for those.

@wolfgangwalther wolfgangwalther merged commit ac3927f into NixOS:release-24.11 Feb 1, 2025
25 of 27 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-scheduled-workflows branch February 1, 2025 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants