Skip to content

Commit 5e24cf3

Browse files
committed
CI/CD - use full paths in workflows instead of relative ones
1 parent fab6910 commit 5e24cf3

1 file changed

Lines changed: 39 additions & 23 deletions

File tree

.github/workflows/build_linux.yml

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,73 +9,89 @@ jobs:
99
- name: Clone Tree
1010
uses: actions/checkout@v6
1111
with:
12+
path: occt-samples-qt.git
1213
fetch-depth: 1
1314
- name: Install Dependencies
1415
run: |
16+
# libtbb-dev is added as a workaround for broken CMake configuration files within libocct
1517
sudo apt-get update
1618
sudo apt-get install -y \
1719
g++ cmake ninja-build \
18-
libocct-draw-dev libocct-visualization-dev libocct-ocaf-dev libocct-modeling-data-dev \
19-
libocct-modeling-algorithms-dev libocct-foundation-dev libocct-data-exchange-dev \
20+
libocct-visualization-dev libocct-modeling-data-dev \
21+
libocct-modeling-algorithms-dev libocct-foundation-dev \
2022
libgl-dev libegl-dev \
21-
tcllib tklib tcl-dev tk-dev \
2223
libtbb-dev \
2324
qtbase5-dev qtdeclarative5-dev qtquickcontrols2-5-dev \
2425
qml-module-qtquick-controls2 qml-module-qtquick-templates2 qml-module-qtquick-dialogs \
2526
xvfb scrot
2627
- name: Configure project
2728
run: |
28-
mkdir "build"
29-
cmake -G Ninja -S . -B "./build" -D QT_VERSION=Qt5
29+
cmake -S "$GITHUB_WORKSPACE/occt-samples-qt.git" -B "$GITHUB_WORKSPACE/occt-samples-qt-make" -G Ninja \
30+
-D CMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/occt-samples-qt" \
31+
-D QT_VERSION=Qt5
3032
- name: Build project
3133
run: |
32-
cmake --build "./build" --config Release
34+
cmake --build "$GITHUB_WORKSPACE/occt-samples-qt-make" --config Release
35+
- name: Install project
36+
run: |
37+
cmake --build "$GITHUB_WORKSPACE/occt-samples-qt-make" --config Release --target install
3338
- name: Run tests
3439
run: |
35-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qwidget/occt-qwidget-sample ./build/occt-qwidget.png 5
36-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qopenglwidget/occt-qopenglwidget-sample ./build/occt-qopenglwidget.png 5
37-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qtquick/occt-qtquick-sample ./build/occt-qtquick.png 5
40+
screenshot_sh=$GITHUB_WORKSPACE/occt-samples-gtk.git/.github/workflows/screenshot.sh
41+
pushd $GITHUB_WORKSPACE/occt-samples-qt
42+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qwidget-sample ./occt-qwidget.png 5
43+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qopenglwidget-sample ./occt-qopenglwidget.png 5
44+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qtquick-sample ./occt-qtquick.png 5
45+
popd
3846
- name: Upload artifacts
3947
uses: actions/upload-artifact@v4
4048
with:
41-
name: occt-qt5
42-
path: ./build/*.png
49+
name: occt-qt5-linux
50+
path: occt-samples-qt/*.png
4351

4452
linux-gcc-qt6:
4553
runs-on: ubuntu-24.04
4654
steps:
4755
- name: Clone Tree
4856
uses: actions/checkout@v6
4957
with:
58+
path: occt-samples-qt.git
5059
fetch-depth: 1
5160
- name: Install Dependencies
5261
run: |
62+
# libtbb-dev is added as a workaround for broken CMake configuration files within libocct
5363
sudo apt-get update
5464
sudo apt-get install -y \
5565
g++ cmake ninja-build \
56-
libocct-draw-dev libocct-visualization-dev libocct-ocaf-dev libocct-modeling-data-dev \
57-
libocct-modeling-algorithms-dev libocct-foundation-dev libocct-data-exchange-dev \
66+
libocct-visualization-dev libocct-modeling-data-dev \
67+
libocct-modeling-algorithms-dev libocct-foundation-dev \
5868
libgl-dev libegl-dev \
59-
tcllib tklib tcl-dev tk-dev \
6069
libtbb-dev \
6170
qt6-base-dev qt6-declarative-dev \
6271
qml6-module-qtquick-window qml6-module-qtquick-controls qml6-module-qtquick-templates qml6-module-qtquick-dialogs qml6-module-qtqml-workerscript \
6372
xvfb scrot
6473
- name: Configure project
6574
run: |
66-
mkdir "build"
67-
cmake -G Ninja -S . -B "./build" -D QT_VERSION=Qt6
75+
cmake -S "$GITHUB_WORKSPACE/occt-samples-qt.git" -B "$GITHUB_WORKSPACE/occt-samples-qt-make" -G Ninja \
76+
-D CMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/occt-samples-qt" \
77+
-D QT_VERSION=Qt6
6878
- name: Build project
6979
run: |
70-
cmake --build "./build" --config Release
80+
cmake --build "$GITHUB_WORKSPACE/occt-samples-qt-make" --config Release
81+
- name: Install project
82+
run: |
83+
cmake --build "$GITHUB_WORKSPACE/occt-samples-qt-make" --config Release --target install
7184
- name: Run tests
7285
run: |
73-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qwidget/occt-qwidget-sample ./build/occt-qwidget.png 5
74-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qopenglwidget/occt-qopenglwidget-sample ./build/occt-qopenglwidget.png 5
75-
xvfb-run --server-args="-screen 0 800x600x24" ./.github/workflows/screenshot.sh ./build/occt-qtquick/occt-qtquick-sample ./build/occt-qtquick.png 5
86+
screenshot_sh=$GITHUB_WORKSPACE/occt-samples-gtk.git/.github/workflows/screenshot.sh
87+
pushd $GITHUB_WORKSPACE/occt-samples-qt
88+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qwidget-sample ./occt-qwidget.png 5
89+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qopenglwidget-sample ./occt-qopenglwidget.png 5
90+
xvfb-run --server-args="-screen 0 800x600x24" $screenshot_sh ./occt-qtquick-sample ./occt-qtquick.png 5
91+
popd
7692
- name: Upload artifacts
7793
uses: actions/upload-artifact@v4
7894
with:
79-
name: occt-qt6
80-
path: ./build/*.png
81-
95+
name: occt-qt6-linux
96+
path: occt-samples-qt/*.png
97+

0 commit comments

Comments
 (0)