Skip to content

Conversation

@sssd-bot
Copy link

@sssd-bot sssd-bot commented Jan 8, 2026

This is an automatic backport of PR#8320 ci: bump actions/upload-artifact from 5 to 6 to branch sssd-2-10, created by @app/dependabot.

Caution

@app/dependabot The patches did not apply cleanly. It is necessary to resolve conflicts before merging this pull request. Commits that introduced conflict are marked with CONFLICT!.

You can push changes to this pull request

git remote add sssd-bot git@github.com:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8320-to-sssd-2-10
git checkout SSSD-sssd-backport-pr8320-to-sssd-2-10
git push sssd-bot SSSD-sssd-backport-pr8320-to-sssd-2-10 --force

Original commits
1280ffe - ci: bump actions/upload-artifact from 5 to 6

Backported commits

  • 6afd660 - CONFLICT! ci: bump actions/upload-artifact from 5 to 6

Conflicting Files Information (check for deleted and re-added files)

  • CONFLICT! ci: bump actions/upload-artifact from 5 to 6
On branch SSSD-sssd-backport-pr8320-to-sssd-2-10
You are currently cherry-picking commit 1280ffe06.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build.yml
	modified:   .github/workflows/static-code-analysis.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

Original Pull Request Body

Bumps actions/upload-artifact from 5 to 6.

Release notes

Sourced from actions/upload-artifact's releases.

v6.0.0

v6 - What's new

[!IMPORTANT] actions/upload-artifact@v6 now runs on Node.js 24 (runs.using: node24) and requires a minimum Actions Runner version of 2.327.1. If you are using self-hosted runners, ensure they are updated before upgrading.

Node.js 24

This release updates the runtime to Node.js 24. v5 had preliminary support for Node.js 24, however this action was by default still running on Node.js 20. Now this action by default will run on Node.js 24.

What's Changed

Full Changelog: actions/upload-artifact@v5.0.0...v6.0.0

Commits
  • b7c566a Merge pull request #745 from actions/upload-artifact-v6-release
  • e516bc8 docs: correct description of Node.js 24 support in README
  • ddc45ed docs: update README to correct action name for Node.js 24 support
  • 615b319 chore: release v6.0.0 for Node.js 24 support
  • 017748b Merge pull request #744 from actions/fix-storage-blob
  • 38d4c79 chore: rebuild dist
  • 7d27270 chore: add missing license cache files for @​actions/core, @​actions/io, and mi...
  • 5f643d3 chore: update license files for @​actions/artifact@​5.0.1 dependencies
  • 1df1684 chore: update package-lock.json with @​actions/artifact@​5.0.1
  • b5b1a91 fix: update @​actions/artifact to ^5.0.0 for Node.js 24 punycode fix
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@gemini-code-assist
Copy link

Note

Gemini is unable to generate a review for this pull request due to the file types involved not being currently supported.

@justin-stephenson justin-stephenson force-pushed the SSSD-sssd-backport-pr8320-to-sssd-2-10 branch from 6afd660 to c167a3e Compare January 8, 2026 17:24
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Reviewed-by: Justin Stephenson <jstephen@redhat.com>
(cherry picked from commit 1280ffe)
@sssd-bot
Copy link
Author

sssd-bot commented Jan 8, 2026

The pull request was accepted by @justin-stephenson with the following PR CI status:


🟡 rpm-build:centos-stream-10-x86_64:upstream (in_progress)
🟡 Build / make-distcheck (in_progress)
🟢 ci / prepare (success)
🟡 ci / system (centos-10) (in_progress)
🟡 Static code analysis / codeql (in_progress)
🟢 Static code analysis / pre-commit (success)
🟡 Static code analysis / python-system-tests (in_progress)


There are unsuccessful or unfinished checks. Make sure that the failures are not related to this pull request before merging.

@sssd-bot sssd-bot force-pushed the SSSD-sssd-backport-pr8320-to-sssd-2-10 branch from c167a3e to 6a67c7e Compare January 8, 2026 17:26
@justin-stephenson justin-stephenson marked this pull request as ready for review January 8, 2026 17:28
@justin-stephenson justin-stephenson merged commit 1f47675 into SSSD:sssd-2-10 Jan 8, 2026
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants