Skip to content

Commit

Permalink
Update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
gaspard-lebaube committed Jan 27, 2025
1 parent 865768b commit a1ba9ea
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Automerge

on:
schedule:
- cron: '30 06,18 * * *'
- cron: '45 06,18 * * *'

pull_request_review:
types:
Expand All @@ -18,7 +18,7 @@ on:
- unlabeled
- ready_for_review
branches:
- master
- main

workflow_dispatch:
inputs:
Expand All @@ -34,9 +34,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: reitermarkus/[email protected]
with:
token: ${{ secrets.WORKFLOW_TOKEN }}
required-labels: automerge
pull-request: ${{ github.event.inputs.pull-request }}
review: ${{ github.event.inputs.review }}
- name: Checkout repository
uses: actions/[email protected]

- name: Merge pull request
if: contains(github.event.pull_request.labels.*.name, 'automerge')
run: gh pr merge ${{ github.event.pull_request.number }} --auto --merge
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

version-management:
needs: [initialize]
if: github.event.pull_request.merged == true || github.event_name == 'release' || github.event_name == 'workflow_dispatch'
if: (github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'no-release')) || github.event_name == 'release' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
outputs:
VERSION_DONE: ${{ steps.mark_version.outputs.VERSION_DONE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
uses: saadmk11/[email protected]
with:
token: ${{ secrets.WORKFLOW_TOKEN }}
pull_request_labels: "automerge"
pull_request_labels: "automerge, no-release"

0 comments on commit a1ba9ea

Please sign in to comment.