From 7d5f82e3dbd7cbd2cc207a93e96b3c8ec86225f5 Mon Sep 17 00:00:00 2001 From: AliceMazzoleni99 Date: Tue, 10 Nov 2026 17:22:41 +0100 Subject: [PATCH] dev/Fix/nfs deploy workflows (#1672) * reset udp streaming for all modules * Revert "reset udp streaming for all modules" This reverts commit e0d0a13deff45af7431f388f2eff7897b46ccaee. * fixed nfs upload workflows * only build on push * execute workflows on push for testing * temporarily disable local tests * forgot to commit * also upload if not push to developer for testing * reverted testing mode --- .github/workflows/cmake.yaml | 2 +- .github/workflows/rh8-local-tests.yaml | 5 +++++ .github/workflows/rh8-nfs-deploy.yaml | 6 +++--- .github/workflows/rh9-local-tests.yaml | 4 ++++ .github/workflows/rh9-nfs-deploy.yaml | 1 - 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index c6903502b..10674332e 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -1,6 +1,6 @@ name: Native CMake Build -on: [push, pull_request, workflow_dispatch] +on: [push, workflow_dispatch] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/rh8-local-tests.yaml b/.github/workflows/rh8-local-tests.yaml index c4eb0aabc..6c5a66bf4 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 2d275dc0c..4112ce6da 100644 --- a/.github/workflows/rh8-nfs-deploy.yaml +++ b/.github/workflows/rh8-nfs-deploy.yaml @@ -27,6 +27,6 @@ jobs: - name: Deploy to NFS update server if: github.ref == 'refs/heads/developer' run: | - sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put build/bin' - sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put pyctbgui' - sftp -r gitea_runner@mpc2935:/slsDetectorSoftware/RH8 <<< $'put slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer' \ No newline at end of file + cp -r build/bin /home/github_runner/slsDetectorSoftware/RH8 + cp slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer /home/github_runner/slsDetectorSoftware/RH8 + cp -r pyctbgui /home/github_runner/slsDetectorSoftware/RH8 \ No newline at end of file diff --git a/.github/workflows/rh9-local-tests.yaml b/.github/workflows/rh9-local-tests.yaml index 9671df226..38ff6fea1 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 5234f9fd3..745ede055 100644 --- a/.github/workflows/rh9-nfs-deploy.yaml +++ b/.github/workflows/rh9-nfs-deploy.yaml @@ -18,7 +18,6 @@ jobs: - name: Build library run: | mkdir build && cd build - conda activate det cmake .. -DSLS_USE_PYTHON=ON -DSLS_USE_SIMULATOR=ON -DSLS_USE_GUI=ON make -j 2