diff --git a/.github/workflows/rh8-local-tests.yaml b/.github/workflows/rh8-local-tests.yaml index 3998578eb..2ace31c45 100644 --- a/.github/workflows/rh8-local-tests.yaml +++ b/.github/workflows/rh8-local-tests.yaml @@ -4,6 +4,11 @@ on: #pull_request: workflow_dispatch: +# Cancel older runs of this workflow for the same PR/branch when a new push arrives +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Debug diff --git a/.github/workflows/rh8-nfs-deploy.yaml b/.github/workflows/rh8-nfs-deploy.yaml index 4033ef6f7..f3f7a5f70 100644 --- a/.github/workflows/rh8-nfs-deploy.yaml +++ b/.github/workflows/rh8-nfs-deploy.yaml @@ -25,7 +25,8 @@ jobs: make -j 2 - name: Deploy to NFS update server - if: github.ref == 'refs/heads/developer' + #if + #: github.ref == 'refs/heads/developer' run: | cp -r build/bin /home/github_runner/slsDetectorSoftware/RH8 cp slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer /home/github_runner/slsDetectorSoftware/RH8 diff --git a/.github/workflows/rh9-local-tests.yaml b/.github/workflows/rh9-local-tests.yaml index bdac219e4..cb9e1e3f3 100644 --- a/.github/workflows/rh9-local-tests.yaml +++ b/.github/workflows/rh9-local-tests.yaml @@ -4,6 +4,10 @@ on: #pull_request: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Debug diff --git a/.github/workflows/rh9-nfs-deploy.yaml b/.github/workflows/rh9-nfs-deploy.yaml index 4e5e004ec..9868c38df 100644 --- a/.github/workflows/rh9-nfs-deploy.yaml +++ b/.github/workflows/rh9-nfs-deploy.yaml @@ -22,7 +22,8 @@ jobs: make -j 2 - name: Deploy to NFS update server - if: github.ref == 'refs/heads/developer' + #if + #:github.ref == 'refs/heads/developer' run: | sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put build/bin' sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH9 <<< $'put pyctbgui'