Skip to content

Merge pending dependabot GitHub Actions bumps into dev#89

Merged
alpae merged 20 commits intomainfrom
copilot/merge-all-requests
Mar 17, 2026
Merged

Merge pending dependabot GitHub Actions bumps into dev#89
alpae merged 20 commits intomainfrom
copilot/merge-all-requests

Conversation

Copy link
Contributor

Copilot AI commented Feb 27, 2026

Five open dependabot PRs (#84#88) targeting dev had accumulated without being merged. This consolidates all their changes into a single update targeting dev.

Changes

  • nf-test.yml

    • actions/checkout0c366fd (v6.0.2)
    • actions/setup-pythona309ff8 (v6.2.0)
    • actions/setup-javabe666c2 (v4 latest)
    • conda-incubator/setup-minicondafc2d68f (v3.3.0)
    • actions/upload-artifact v6 → v7
    • Synced env vars from dev: NFT_VER 0.9.4, updated workdir paths (/tmp/nft-test), added NXF_WORK and NXF_CONDA_CACHEDIR
  • docker-image.yml

    • Replaced with dev branch version: multi-platform matrix build with separate linux/amd64 and linux/arm64 runners, digest-based push, merge job for manifest list creation, and publish-doc job for DockerHub description updates
  • publish-pypi-release.yml

    • actions/checkout and actions/setup-python pinned to major version @v6

🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.

alpae and others added 8 commits December 20, 2025 00:11
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.2.0 to 6.1.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v5.2.0...v6.1.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…/actions/setup-python-6.1.0

Bump actions/setup-python from 5.2.0 to 6.1.0
license file and publication always refered to MPL-2.0, only the
license attribute in the pyproject.toml file was wrong (MIT).
This script processes proteome data by parsing FASTA files, extracting transcripts, and writing splice files for species with multiple transcripts.
If external subprocesses such as mafft got killed (e.g. by SLURM)
because of OOM, the main FastOMA python process did simply raise an
Exception and terminated with exit code 1. This prevented nextflow
from restarting it with more memory/time.

We now report properly the exit code of Mafft and FastTree and exit
the python code with the same exit code (stored in WrapperError)
Copilot AI changed the title [WIP] Merge all pending requests into main branch Merge pending dependabot GitHub Actions bumps into main Feb 27, 2026
@alpae alpae marked this pull request as ready for review March 3, 2026 13:06
@alpae
Copy link
Member

alpae commented Mar 4, 2026

@copilot this should be merged into dev, not main!

Copy link
Contributor Author

Copilot AI commented Mar 4, 2026

@copilot this should be merged into dev, not main!

Addressed in 65c95ce. The workflow files (nf-test.yml and docker-image.yml) have been updated to use the dev branch as their base — picking up all the diverged changes in dev (updated NFT_VER, workdir paths, multi-platform Docker build, etc.) — with the dependabot bumps applied on top. The PR still needs its base branch changed from main to dev via the GitHub UI.

Copilot AI changed the title Merge pending dependabot GitHub Actions bumps into main Merge pending dependabot GitHub Actions bumps into dev Mar 4, 2026
Copilot finished work on behalf of alpae March 4, 2026 13:34
@alpae
Copy link
Member

alpae commented Mar 4, 2026

@copilot please rebase to current dev

Copy link
Contributor Author

Copilot AI commented Mar 4, 2026

@copilot please rebase to current dev

The file contents already reflect current dev + the dependabot bumps (synced in 65c95ce), but performing an actual git rebase requires a force push which isn't available to me. To complete the rebase you can run:

git fetch origin dev
git rebase origin/dev
git push --force origin copilot/merge-all-requests

Alternatively, changing the PR's base branch from main to dev in the GitHub UI should be sufficient — the diff shown will then be exactly the dependabot bumps relative to dev.

Copilot finished work on behalf of alpae March 4, 2026 13:48
Copilot AI and others added 2 commits March 17, 2026 16:40
Co-authored-by: alpae <1444726+alpae@users.noreply.github.com>
@alpae alpae force-pushed the copilot/merge-all-requests branch from 65c95ce to 45c0ab7 Compare March 17, 2026 15:48
@alpae alpae merged commit 29f95f5 into main Mar 17, 2026
16 checks passed
@alpae alpae deleted the copilot/merge-all-requests branch March 17, 2026 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants