Skip to content

workflows/periodic-merge: move fork condition to calling workflow#373178

Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom
wolfgangwalther:ci-skip-periodic-merge-in-forks
Jan 12, 2025
Merged

workflows/periodic-merge: move fork condition to calling workflow#373178
wolfgangwalther merged 1 commit intoNixOS:masterfrom
wolfgangwalther:ci-skip-periodic-merge-in-forks

Conversation

@wolfgangwalther
Copy link
Contributor

Fixes #371216 (comment)

Apparently the skipping needs to happen on the calling workflow, otherwise those workflows show up as "failed" in forks instead of skipped.

This is reproducible by manually calling the workflow, too. Before and after the fix in my fork:

20250112-134204-171914118

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Apparently the skipping needs to happen on the calling workflow,
otherwise those workflows show up as "failed" in forks instead of
skipped.
@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 Jan 12, 2025
@wolfgangwalther wolfgangwalther mentioned this pull request Jan 12, 2025
13 tasks
@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 Jan 12, 2025
@wolfgangwalther wolfgangwalther merged commit fc5c581 into NixOS:master Jan 12, 2025
21 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-skip-periodic-merge-in-forks branch January 12, 2025 12:55
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.

1 participant