From aead89f644d1a5f8992d1dc023abd46690e7f83a Mon Sep 17 00:00:00 2001 From: m-jahn Date: Wed, 12 Nov 2025 13:00:36 +0100 Subject: [PATCH 1/3] fix: release please action --- .github/workflows/conventional-prs.yml | 12 ++++++---- .github/workflows/release-please.yml | 31 +++++++------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.github/workflows/conventional-prs.yml b/.github/workflows/conventional-prs.yml index d926109..7ec5249 100644 --- a/.github/workflows/conventional-prs.yml +++ b/.github/workflows/conventional-prs.yml @@ -1,4 +1,4 @@ -name: PR +name: Lint PR on: pull_request_target: types: @@ -7,10 +7,14 @@ on: - edited - synchronize +permissions: + pull-requests: read + jobs: - title-format: + main: + name: Validate PR title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@v3.4.0 + - uses: amannn/action-semantic-pull-request@v6 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index ddeb755..7963960 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -3,33 +3,18 @@ on: branches: - master +permissions: + contents: write + pull-requests: write + issues: write + name: release-please jobs: release-please: runs-on: ubuntu-latest steps: - - - uses: GoogleCloudPlatform/release-please-action@v2 - id: release + - uses: googleapis/release-please-action@v4 with: - release-type: go # just no update of version anywhere needed - package-name: ${{env.ACTION_NAME}} - - - uses: actions/checkout@v2 - if: ${{ steps.release.outputs.release_created }} - - - name: tag major and minor versions - if: ${{ steps.release.outputs.release_created }} - run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com - git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git" - git tag -d v${{ steps.release.outputs.major }} || true - git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true - git push origin :v${{ steps.release.outputs.major }} || true - git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true - git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}" - git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}" - git push origin v${{ steps.release.outputs.major }} - git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} + release-type: go # just keep a changelog, no version anywhere outside of git tags From 7fac3c21c77d7a8534eedff23bfe3d99b0a01d58 Mon Sep 17 00:00:00 2001 From: m-jahn Date: Wed, 12 Nov 2025 13:08:57 +0100 Subject: [PATCH 2/3] fix: add required dir in examples + formatting --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 05c4ef2..6147426 100644 --- a/README.md +++ b/README.md @@ -32,25 +32,25 @@ Whether used disk space shall be printed if Snakemake fails. Can be either `true ```yaml - name: Linting - uses: snakemake/snakemake-github-action@v1 + uses: snakemake/snakemake-github-action@v2 with: - directory: '.test' - snakefile: 'workflow/Snakefile' - args: '--lint' + directory: ".test" + snakefile: "workflow/Snakefile" + args: "--lint" - name: Testing uses: snakemake/snakemake-github-action@v2 with: - directory: '.test' - snakefile: 'workflow/Snakefile' - args: '--cores 1 --sdm conda --conda-cleanup-pkgs cache' - stagein: '' # additional preliminary commands to run (can be multiline) + directory: ".test" + snakefile: "workflow/Snakefile" + args: "--cores 1 --sdm conda --conda-cleanup-pkgs cache" + stagein: "" # additional preliminary commands to run (can be multiline) show-disk-usage-on-error: true - - name: Create container file uses: snakemake/snakemake-github-action@v2 with: - snakefile: 'workflow/Snakefile' - task: 'containerize' + directory: ".test" + snakefile: "workflow/Snakefile" + task: "containerize" ``` From 33167b083a7b7076c0fc04a6995a71e5d90f8a3b Mon Sep 17 00:00:00 2001 From: m-jahn Date: Fri, 12 Dec 2025 09:57:24 +0100 Subject: [PATCH 3/3] fix: bring back major minor tagging --- .github/workflows/conventional-prs.yml | 5 ++--- .github/workflows/release-please.yml | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conventional-prs.yml b/.github/workflows/conventional-prs.yml index 7ec5249..e063eb4 100644 --- a/.github/workflows/conventional-prs.yml +++ b/.github/workflows/conventional-prs.yml @@ -7,13 +7,12 @@ on: - edited - synchronize -permissions: - pull-requests: read - jobs: main: name: Validate PR title runs-on: ubuntu-latest + permissions: + pull-requests: read steps: - uses: amannn/action-semantic-pull-request@v6 env: diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 7963960..d6086aa 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -15,6 +15,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: googleapis/release-please-action@v4 + id: release with: token: ${{ secrets.GITHUB_TOKEN }} release-type: go # just keep a changelog, no version anywhere outside of git tags + - uses: actions/checkout@v4 + - name: tag major and minor versions + if: ${{ steps.release.outputs.release_created }} + run: | + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/googleapis/release-please-action.git" + git tag -d v${{ steps.release.outputs.major }} || true + git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true + git push origin :v${{ steps.release.outputs.major }} || true + git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true + git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}" + git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}" + git push origin v${{ steps.release.outputs.major }} + git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}