mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-11-18 17:24:04 +01:00
* dev/Fix/nfs deploy workflows (#1672)
* reset udp streaming for all modules
* Revert "reset udp streaming for all modules"
This reverts commit e0d0a13def.
* 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
* fixed shared memory test
* Refactor SharedMemory test by removing Apple checks
Removed platform-specific code for Apple from SharedMemory test.
This commit is contained in:
1 parent
2ab700de1b
commit
438a265d7e
6 files changed
+18
-7
No files matched your search
@@ -1,7 +1,7 @@
|
||||
name: Native CMake Build
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
on: [push, workflow_dispatch]
|
||||
|
||||
env:
|
||||
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
||||
BUILD_TYPE: Debug
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -29,6 +29,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'
|
||||
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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
cd ../pyctbgui
|
||||
|
||||
@@ -38,9 +38,12 @@ void freeShm(const int dindex, const int mIndex) {
|
||||
}
|
||||
|
||||
constexpr int shm_id = 10;
|
||||
|
||||
const char *env_p = std::getenv(SHM_ENV_NAME);
|
||||
std::string env_name = env_p ? ("_" + std::string(env_p)) : "";
|
||||
const std::string file_path =
|
||||
std::string("/dev/shm/slsDetectorPackage_detector_") +
|
||||
std::to_string(shm_id);
|
||||
std::to_string(shm_id) + env_name;
|
||||
|
||||
TEST_CASE("Free obsolete (without isValid)", "[detector][shm]") {
|
||||
|
||||
|
||||
Reference in new issue
Block a user