mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-12 15:08:15 +02:00
Merge branch 'developer' into dev/rx_disable_datastream_port
This commit is contained in:
@@ -52,7 +52,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Install System Packages
|
||||
uses: awalsh128/cache-apt-pkgs-action@latest
|
||||
uses: awalsh128/cache-apt-pkgs-action@v1.6.1
|
||||
with:
|
||||
packages: libhdf5-dev doxygen libfmt-dev
|
||||
version: 1.0
|
||||
|
||||
@@ -27,36 +27,6 @@ jobs:
|
||||
packages: libhdf5-dev qtbase5-dev qt5-qmake libqt5svg5-dev libpng-dev libtiff-dev libfmt-dev
|
||||
version: 1.0
|
||||
|
||||
# verify packages restored from cache are installed.
|
||||
# This catches incomplete apt installs after cache restore.
|
||||
- name: Verify apt packages
|
||||
id: verify_packages
|
||||
run: |
|
||||
failed=""
|
||||
|
||||
for pkg in \
|
||||
libhdf5-dev \
|
||||
qtbase5-dev \
|
||||
qt5-qmake \
|
||||
libqt5svg5-dev \
|
||||
libpng-dev \
|
||||
libtiff-dev \
|
||||
libfmt-dev
|
||||
do
|
||||
if ! dpkg -s "$pkg" >/dev/null 2>&1; then
|
||||
echo "Missing: $pkg"
|
||||
failed="$failed $pkg"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
if [ -n "$failed" ]; then
|
||||
echo "Missing packages after cache restore: $failed. Try deleting the cache and rerunning the workflow."
|
||||
exit 1
|
||||
else
|
||||
echo "All apt packages are installed"
|
||||
fi
|
||||
|
||||
- name: Configure CMake
|
||||
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
|
||||
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
|
||||
|
||||
@@ -26,31 +26,6 @@ jobs:
|
||||
packages: libhdf5-dev libfmt-dev
|
||||
version: 1.0
|
||||
|
||||
# verify packages restored from cache are installed.
|
||||
# This catches incomplete apt installs after cache restore.
|
||||
- name: Verify apt packages
|
||||
id: verify_packages
|
||||
run: |
|
||||
failed=""
|
||||
|
||||
for pkg in \
|
||||
libhdf5-dev \
|
||||
libfmt-dev
|
||||
do
|
||||
if ! dpkg -s "$pkg" >/dev/null 2>&1; then
|
||||
echo "Missing: $pkg"
|
||||
failed="$failed $pkg"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$failed" ]; then
|
||||
echo "Missing packages after cache restore: $failed. Try deleting the cache and rerunning the workflow."
|
||||
exit 1
|
||||
else
|
||||
echo "All apt packages are installed"
|
||||
fi
|
||||
|
||||
|
||||
- name: Configure CMake
|
||||
run: |
|
||||
cmake -B ${{github.workspace}}/build \
|
||||
|
||||
Reference in New Issue
Block a user