Skip to content

Commit 751ffb0

Browse files
author
berndgassmann
authored
Fix docu build
1 parent 4655801 commit 751ffb0

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.github/workflows/build_test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ jobs:
7070
run: |
7171
sudo apt-get install ${EXTRA_PACKAGES}
7272
rm -rf log build install
73-
source map-build-venv/bin/activate && eval CC=${CC} CXX=${CXX} ${BUILDCMD}
73+
source map-build-venv/bin/activate
74+
eval CC=${CC} CXX=${CXX} ${BUILDCMD}

.github/workflows/check_documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
- name: Documentation Deployment (Test)
5858
env:
59-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
GITHUB_TOKEN: ${{ secrets.BUILD_DOCU_TOKEN }}
6060
run: |
6161
if [ ${{ github.event_name }} != 'pull_request' ]; then bash .github/workflows/deploy_documentation.sh true; else bash .github/workflows/deploy_documentation.sh false; fi

.github/workflows/codeql.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ jobs:
9494

9595
- name: Build
9696
run: |
97-
source map-build-venv/bin/activate && colcon build --event-handlers console_direct+ --executor sequential --packages-up-to ad_map_access --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON
97+
source map-build-venv/bin/activate
98+
colcon build --event-handlers console_direct+ --executor sequential --packages-up-to ad_map_access --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON
9899
99100
- name: Perform CodeQL Analysis
100101
uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2

.github/workflows/release_qgis_plugin.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929

3030
- name: Build Libraries
3131
run: |
32-
source map-build-venv/bin/activate && colcon build --event-handlers console_direct+ --executor sequential --metas colcon_python.meta --packages-up-to ad_map_access_qgis
32+
source map-build-venv/bin/activate
33+
colcon build --event-handlers console_direct+ --executor sequential --metas colcon_python.meta --packages-up-to ad_map_access_qgis
3334
3435
- name: Build Package
3536
run: |
@@ -41,6 +42,6 @@ jobs:
4142
uses: svenstaro/upload-release-action@5e35e583720436a2cc5f9682b6f55657101c1ea1 # v2
4243
if: ${{ github.event_name == 'release'}}
4344
with:
44-
repo_token: ${{ secrets.GITHUB_TOKEN }}
45+
repo_token: ${{ secrets.BUILD_DOCU_TOKEN }}
4546
file: ad_map_access_qgis.zip
4647
tag: ${{ github.ref }}

.github/workflows/wheels.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,27 @@ jobs:
4545
- name: Install Dependencies
4646
run: |
4747
bash .github/workflows/install_dependencies.sh
48-
source map-build-venv/bin/activate && python${PYTHON_BINDING_VERSION} -m pip install auditwheel && python${PYTHON_BINDING_VERSION} -m pip install --upgrade patchelf>=0.14
48+
source map-build-venv/bin/activate
49+
python${PYTHON_BINDING_VERSION} -m pip install auditwheel && python${PYTHON_BINDING_VERSION} -m pip install --upgrade patchelf>=0.14
4950
5051
- name: Build wheels
5152
shell: bash
5253
run: |
53-
source map-build-venv/bin/activate && colcon build --packages-select PROJ4 --event-handlers console_direct+ --cmake-args -DCMAKE_POSITION_INDEPENDENT_CODE=ON
54+
source map-build-venv/bin/activate
55+
colcon build --packages-select PROJ4 --event-handlers console_direct+ --cmake-args -DCMAKE_POSITION_INDEPENDENT_CODE=ON
5456
source install/setup.bash
55-
source map-build-venv/bin/activate && colcon build --packages-up-to ad_map_access --event-handlers console_direct+ --cmake-args -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION} --metas colcon_python.meta
57+
colcon build --packages-up-to ad_map_access --event-handlers console_direct+ --cmake-args -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION} --metas colcon_python.meta
5658
5759
- name: Repair wheels
5860
shell: bash
5961
run: |
62+
source map-build-venv/bin/activate
6063
source install/setup.bash
6164
for whl in install/ad_physics/dist/*.whl; do
62-
source map-build-venv/bin/activate && auditwheel repair $whl --plat ${WHEEL_PLATFORM} --wheel-dir wheelhouse
65+
auditwheel repair $whl --plat ${WHEEL_PLATFORM} --wheel-dir wheelhouse
6366
done
6467
for whl in install/ad_map_access/dist/*.whl; do
65-
source map-build-venv/bin/activate && auditwheel repair $whl --plat ${WHEEL_PLATFORM} --wheel-dir wheelhouse
68+
auditwheel repair $whl --plat ${WHEEL_PLATFORM} --wheel-dir wheelhouse
6669
done
6770
6871
- name: Publish wheels to PyPI

0 commit comments

Comments
 (0)