diff --git a/.github/workflows/label-conflicts.yml b/.github/workflows/label-conflicts.yml deleted file mode 100644 index 5de5993d..00000000 --- a/.github/workflows/label-conflicts.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Label merge conflicts - -on: - push: - branches: ["main"] - pull_request_target: - types: ["synchronize", "reopened", "opened"] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }} - cancel-in-progress: true - -jobs: - triage-conflicts: - runs-on: ubuntu-latest - steps: - - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021 - with: - CONFLICT_LABEL_NAME: "has conflicts" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAX_RETRIES: 3 - WAIT_MS: 5000 diff --git a/.github/workflows/releasing.yml b/.github/workflows/releasing.yml index 8c04a794..05c919ee 100644 --- a/.github/workflows/releasing.yml +++ b/.github/workflows/releasing.yml @@ -1,13 +1,8 @@ name: PyPI Release on: - push: - branches: [main] - tags: ["v?[0-9]+.[0-9]+.[0-9]+"] - pull_request: - branches: [main] - release: - types: [published] + release: + types: [published] jobs: # based on https://github.com/pypa/gh-action-pypi-publish