diff --git a/.github/workflows/cron-conda.yml b/.github/workflows/cron-conda.yml index 02e7e9c0f..18b102492 100644 --- a/.github/workflows/cron-conda.yml +++ b/.github/workflows/cron-conda.yml @@ -10,6 +10,9 @@ jobs: conda-update: name: Update requirements.txt runs-on: ubuntu-latest + concurrency: + group: repository-maintenance + cancel-in-progress: false permissions: contents: write steps: @@ -61,6 +64,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ github.ref }} + pull: rebase - name: Get Version if: steps.verify-changed-files.outputs.files_changed == 'true' diff --git a/.github/workflows/cron-vendor.yml b/.github/workflows/cron-vendor.yml index d31d891d6..b72b207aa 100644 --- a/.github/workflows/cron-vendor.yml +++ b/.github/workflows/cron-vendor.yml @@ -9,6 +9,9 @@ on: jobs: vendor-update: runs-on: macos-latest + concurrency: + group: repository-maintenance + cancel-in-progress: false permissions: contents: write steps: @@ -66,6 +69,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ github.ref }} + pull: rebase # - name: Create Tag # if: steps.verify-changed-files.outputs.files_changed == 'true'