From 782b77c1f9541260f8db4f94de059532bfab4076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 18 Dec 2024 18:49:27 +0100 Subject: [PATCH 1/3] Only cancel CI runs in PRs and not in main/release branches --- .github/workflows/build-mac.yml | 2 +- .github/workflows/build-pycolmap.yml | 2 +- .github/workflows/build-ubuntu.yml | 2 +- .github/workflows/build-windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index 95b3d3eb6f..dc4b3710c0 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -2,7 +2,7 @@ name: COLMAP (Mac) concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name == 'pull_request' }} on: push: diff --git a/.github/workflows/build-pycolmap.yml b/.github/workflows/build-pycolmap.yml index 6d467b0994..5b637e05f2 100644 --- a/.github/workflows/build-pycolmap.yml +++ b/.github/workflows/build-pycolmap.yml @@ -2,7 +2,7 @@ name: PyCOLMAP concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name == 'pull_request' }} on: push: diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 8f06ce3541..553dbc1bb1 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -2,7 +2,7 @@ name: COLMAP (Ubuntu) concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name == 'pull_request' }} on: push: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 8ed9732a19..301442b202 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -2,7 +2,7 @@ name: COLMAP (Windows) concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name == 'pull_request' }} on: push: From 1c48b6bee780e3a35b060336733d80bee1f9f79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 18 Dec 2024 18:53:01 +0100 Subject: [PATCH 2/3] test cancel --- .github/workflows/build-mac.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index dc4b3710c0..732f39cd44 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -4,6 +4,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} + on: push: branches: From 9f35ef03505bd264c85412e32e867cdec58105d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 18 Dec 2024 18:53:20 +0100 Subject: [PATCH 3/3] works --- .github/workflows/build-mac.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index 732f39cd44..dc4b3710c0 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -4,7 +4,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} - on: push: branches: