Skip to content

chore: Cherry-picked changes from upstream - #17

Open
amanstep wants to merge 5 commits into
mainfrom
auto-cherry-pick
Open

chore: Cherry-picked changes from upstream#17
amanstep wants to merge 5 commits into
mainfrom
auto-cherry-pick

Conversation

@amanstep

@amanstep amanstep commented Oct 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

@amanstep

amanstep commented Oct 14, 2026

Copy link
Copy Markdown
Collaborator Author

📦 Target Release Version: v1.5.9
📋 Previous Release Version: v1.5.2

@amanstep amanstep added the review-required Request Claude AI code review on the PR label Oct 14, 2026
@step-security step-security deleted a comment from github-actions Bot Oct 15, 2026
@step-security step-security deleted a comment from github-actions Bot Oct 15, 2026
@step-security step-security deleted a comment from github-actions Bot Oct 15, 2026
@amanstep amanstep closed this Oct 15, 2026
@amanstep amanstep reopened this Oct 15, 2026
@amanstep

amanstep commented Oct 15, 2026

Copy link
Copy Markdown
Collaborator Author

The two jobs (cache-after-prepare hit and cache-after-prepare key-suffix hit) will pass on runners with more available disk. Failing because of GitHub Actions runner disk space issue

@github-actions

github-actions Bot commented Oct 15, 2026

Copy link
Copy Markdown
Contributor

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v1.5.2...v1.5.9

📋 File-by-File Analysis:

.github/data/base-vm-hash.txt

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

.github/data/datafile.ini

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

.github/data/exclude-missing.txt

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

.github/data/exclude-rsync.txt

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

.github/data/exclude-sshfs.txt

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

.github/data/sync-map.json

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

.github/tpl/README.tpl.md

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

.github/workflows/bump.yml

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

.github/workflows/generate.yml

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

.github/workflows/major.yml

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

.github/workflows/manual.yml

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

.github/workflows/readme.yml

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

.github/workflows/syncbase.yml

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

.github/workflows/test.yml

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

README.md

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

action.yml

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

conf/10.4.conf

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

conf/11.4.conf

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

conf/12.4-aarch64.conf

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

conf/12.4.conf

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

conf/13.2-aarch64.conf

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

conf/13.2-powerpc64.conf

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

conf/13.2-riscv64.conf

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

conf/13.2.conf

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

conf/13.3-aarch64.conf

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

conf/13.3-powerpc64.conf

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

conf/13.3-riscv64.conf

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

conf/13.3.conf

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

conf/13.4-aarch64.conf

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

conf/13.4-powerpc64.conf

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

conf/13.4.conf

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

conf/13.5-aarch64.conf

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

conf/13.5-powerpc64.conf

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

conf/13.5-riscv64.conf

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

conf/13.5.conf

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

conf/14.0-aarch64.conf

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

conf/14.0-powerpc64.conf

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

conf/14.0-riscv64.conf

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

conf/14.0.conf

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

conf/14.1-aarch64.conf

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

conf/14.1-powerpc64.conf

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

conf/14.1-riscv64.conf

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

conf/14.1.conf

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

conf/14.2-aarch64.conf

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

conf/14.2-powerpc64.conf

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

conf/14.2-riscv64.conf

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

conf/14.2.conf

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

conf/14.3-aarch64.conf

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

conf/14.3-powerpc64.conf

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

conf/14.3-riscv64.conf

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

conf/14.3.conf

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

conf/14.4-aarch64.conf

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

conf/14.4-powerpc64.conf

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

conf/14.4-riscv64.conf

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

conf/14.4.conf

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

conf/14.5-aarch64.conf

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

conf/14.5-powerpc64.conf

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

conf/14.5-riscv64.conf

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

conf/14.5.conf

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

conf/15.0-aarch64.conf

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

conf/15.0-powerpc64.conf

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

conf/15.0-riscv64.conf

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

conf/15.0.conf

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

conf/15.1-aarch64.conf

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

conf/15.1-powerpc64.conf

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

conf/15.1-riscv64.conf

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

conf/15.1.conf

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

conf/test.releases

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

index.js

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

📊 Summary:

  • Total files changed upstream: 69
  • Files present in PR: 62/69
  • Files with matching changes: 12/69

❌ Overall Status: 🔴 INCOMPLETE - Missing files or changes

@anurag-stepsecurity

anurag-stepsecurity commented Oct 15, 2026

Copy link
Copy Markdown

Sync verification

Caution

1 item needs review: 1 failed check.

Upstream Versions Files dist/ reproducible config.json
vmactions/freebsd-vm unknown 0 - ❌

Review these

  • ❌ config.json is valid: missing, or written by older tooling
❌ config.json checks
Check Result
config.json is valid ❌ missing, or written by older tooling

anurag-stepsecurity
anurag-stepsecurity requested changes Oct 15, 2026
View reviewed changes
Comment thread index.js Outdated
// and the sync method, plus the optional 'cache-after-prepare-key-suffix'
// value appended at the end, so changing any of them falls back to the
// base image (the suffix is how a user invalidates the cache by hand,
// vmactions/freebsd-vm#167).

@anurag-stepsecurity anurag-stepsecurity Oct 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// vmactions/freebsd-vm#167).

Comment thread README.md Outdated
...
- name: Test
id: test
uses: vmactions/freebsd-vm@v1

@anurag-stepsecurity anurag-stepsecurity Oct 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
uses: vmactions/freebsd-vm@v1
uses: step-security/freebsd-vm@v1

please update all other occurrences.

Comment thread index.js Outdated
// Default under <work>/_actions/_vmcache, NOT os.tmpdir(): the
// ubuntu-26.04 runner image enforces a disk quota on /tmp smaller than
// one extracted qcow2 (EDQUOT). _actions sits
// one extracted qcow2 (EDQUOT, vmactions/freebsd-vm#148). _actions sits

@anurag-stepsecurity anurag-stepsecurity Oct 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// one extracted qcow2 (EDQUOT, vmactions/freebsd-vm#148). _actions sits
// one extracted qcow2 (EDQUOT). _actions sits

Comment thread index.js Outdated
// start and copied back once when this main step ends -- files created by
// a later custom-shell step would otherwise stay in the VM and never
// reach the host. Make every custom-shell step
// reach the host (vmactions/freebsd-vm#128). Make every custom-shell step

@anurag-stepsecurity anurag-stepsecurity Oct 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// reach the host (vmactions/freebsd-vm#128). Make every custom-shell step
// reach the host. Make every custom-shell step

@amanstep amanstep removed the review-required Request Claude AI code review on the PR label Oct 16, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anurag-stepsecurity anurag-stepsecurity anurag-stepsecurity requested changes

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@amanstep @anurag-stepsecurity