43

[RAprogramm]

Closes #43

Problem

When code changes are pushed to main, both workflows trigger simultaneously:

• benchmark.yml (triggers on src/, benches/, Cargo.toml)
• tokei-metrics.yml (triggers on src/, tests/, benches/**, etc.)

Both workflows:

1. Checkout main
2. Update README.md
3. Commit and push

If they run in parallel, second push fails with:

! [rejected]        main -> main (fetch first)
error: failed to push some refs

Failed run example: https://github.com/RAprogramm/cstring-array/actions/runs/18625288263

Solution

Added git pull --rebase origin main before git push in both workflows.

Changes

benchmark.yml:179

git commit -m "chore: update benchmark results [skip ci]"
git pull --rebase origin main  # ← ADDED
git push

tokei-metrics.yml:159

git commit -m "chore: update tokei metrics [skip ci]"
git pull --rebase origin main  # ← ADDED
git push

Benefits

• No more failed workflow runs
• Both metrics update successfully even when running in parallel
• Race-safe concurrent execution
• Changes from parallel workflows are merged via rebase

How it works

1. Workflow A: commits changes
2. Workflow B: commits changes (in parallel)
3. Workflow A: pulls and rebases → pushes successfully
4. Workflow B: pulls and rebases → merges A's changes → pushes successfully

Both workflows complete without conflicts.

Testing

• Workflow syntax validated
• REUSE compliance maintained
• Will be tested on next code push that triggers both workflows