Skip to content

chore: Cherry-picked changes from upstream#280

Merged
Raj-StepSecurity merged 12 commits intomainfrom
auto-cherry-pick
Apr 21, 2026
Merged

chore: Cherry-picked changes from upstream#280
Raj-StepSecurity merged 12 commits intomainfrom
auto-cherry-pick

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Cherry-picked changes from upstream.

@github-actions
Copy link
Copy Markdown
Contributor Author

🚀 PR Updated!

The PR has been updated with the latest cherry-picked commits.

@step-security/maintained-actions-dev Please review and approve the changes.

📦 Target Release Version: v2.9.0
📋 Previous Release Version: v2.8.2

⚠️ Completely Skipped Commits Due to only modifying files in: package.json, package-lock.json, yarn.lock, node_modules/, dist/, or .gitignore

  • 42c55942cfd355e94e6864616f4dbb3392bd2789
  • 6cda4ba16e16069fea0f5a6309681035b9a65754
  • 0aa729bb7a393f8e08f8a9a6eedd94f0df4c65c8
  • 390157d4874246aff722dd7f77e641fcae197678
  • 8a02ed5e290d8afc7e587930243f3016b3223f50
  • bf71d02c11df9d5253618f39943e9dd59f7fd5a9
  • c676846f29d98ff6b0106d3608c7ffd4048af17b

❗ Missing Files:

  • tests/flake.nix

🛑 Workflow Files (Cannot be auto-applied by GitHub Actions):

  • .github/workflows/nix.yml from commit 151eeee51b94b648db7d5aa68ce6a3cad1ddea4e
  • .github/workflows/coverage.yml from commit 73cfdf196a0bbb6037c5250bd89d922a05577d7e
  • .github/workflows/buildjet.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/check-dist.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/coverage.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/dependabot.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/git-registry.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/install.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/multi-job-cache.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/nix.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/simple.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/target-dir.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/workspaces.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/zizmor.yml from commit e73b99eeb067631bf718e31a4c69fb3d35bcf243
  • .github/workflows/check-dist.yml from commit 1a8384176d7ed15c323a201c65073983cdb5a5be
  • .github/workflows/dependabot.yml from commit 1a8384176d7ed15c323a201c65073983cdb5a5be
  • .github/workflows/buildjet.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/check-dist.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/coverage.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/dependabot.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/git-registry.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/install.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/multi-job-cache.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/nix.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/simple.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/target-dir.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/workspaces.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf
  • .github/workflows/zizmor.yml from commit 68500c182e89a3f56d9b1de095d7e62f0ea5b8bf

❌ Conflicting Files:

  • action.yml from commit 1a8384176d7ed15c323a201c65073983cdb5a5be

@github-actions
Copy link
Copy Markdown
Contributor Author

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v2.8.2...v2.9.0

📋 File-by-File Analysis:

.github/workflows/buildjet.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/check-dist.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+5 -5)

.github/workflows/coverage.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+2 -2)

.github/workflows/dependabot.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 4 additions, 4 deletions)

.github/workflows/git-registry.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/install.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/multi-job-cache.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+2 -2)

.github/workflows/nix.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 33 additions, 0 deletions)

.github/workflows/simple.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/target-dir.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/workspaces.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/zizmor.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 2 additions, 2 deletions)

README.md

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+12 -1)

action.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+5 -1) | Missing 1 additions | Missing 1 deletions

src/config.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+72 -23)

src/restore.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+3 -1)

src/save.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+2 -2)

src/utils.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+4 -3)

src/workspace.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+7 -6)

tests/flake.nix

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 31 additions, 0 deletions)

📊 Summary:

  • Total files changed upstream: 20
  • Files present in PR: 7/20
  • Files with matching changes: 6/20

Overall Status: 🔴 INCOMPLETE - Missing files or changes

@github-actions
Copy link
Copy Markdown
Contributor Author

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v2.8.2...v2.9.0

📋 File-by-File Analysis:

.github/workflows/buildjet.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/check-dist.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+5 -5)

.github/workflows/coverage.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+2 -2)

.github/workflows/dependabot.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 4 additions, 4 deletions)

.github/workflows/git-registry.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/install.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/multi-job-cache.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+2 -2)

.github/workflows/nix.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+33 -0) | Missing 2 additions

.github/workflows/simple.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/target-dir.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/workspaces.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+1 -1)

.github/workflows/zizmor.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 2 additions, 2 deletions)

README.md

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+12 -1)

action.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+5 -1) | Missing 1 additions | Missing 1 deletions

src/config.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+72 -23)

src/restore.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+3 -1)

src/save.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+2 -2)

src/utils.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+4 -3)

src/workspace.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+7 -6)

tests/flake.nix

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+31 -0)

📊 Summary:

  • Total files changed upstream: 20
  • Files present in PR: 9/20
  • Files with matching changes: 7/20

Overall Status: 🔴 INCOMPLETE - Missing files or changes

@Raj-StepSecurity Raj-StepSecurity merged commit 595123a into main Apr 21, 2026
45 of 46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants