Skip to content

Commit ec9a5a0

Browse files
berndgassmannberndgassmann
authored
Merge branch 'main' into dependabot/pip/dot-github/setuptools-75.8.0
2 parents a935a05 + 509fe35 commit ec9a5a0

15 files changed

+32
-29
lines changed

‎.github/workflows/build_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Harden Runner
48-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
48+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4949
with:
5050
egress-policy: audit
5151

‎.github/workflows/check_documentation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
23+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
2424
with:
2525
egress-policy: audit
2626

@@ -46,7 +46,7 @@ jobs:
4646
bash .github/workflows/code_coverage.sh
4747
4848
- name: Upload coverage as artifact
49-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
49+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5050
with:
5151
name: coverage_report
5252
path: ./coverage

‎.github/workflows/code_format_check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
21+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
2222
with:
2323
egress-policy: audit
2424

‎.github/workflows/codeql.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
analyze:
2828
name: Analyze
29-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-22.04
3030
permissions:
3131
actions: read
3232
contents: read
@@ -39,6 +39,9 @@ jobs:
3939
# CodeQL supports [ $supported-codeql-languages ]
4040
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4141

42+
env:
43+
PYTHON_BINDING_VERSION: "3.10"
44+
4245
steps:
4346
- name: Free Disk Space (Ubuntu)
4447
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # main
@@ -57,7 +60,7 @@ jobs:
5760
swap-storage: true
5861

5962
- name: Harden Runner
60-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
63+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
6164
with:
6265
egress-policy: audit
6366

@@ -69,7 +72,7 @@ jobs:
6972

7073
# Initializes the CodeQL tools for scanning.
7174
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
75+
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
7376
with:
7477
languages: ${{ matrix.language }}
7578
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -94,7 +97,7 @@ jobs:
9497
colcon build --event-handlers console_direct+ --executor sequential --packages-up-to ad_rss ad_rss_map_integration --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON
9598
9699
- name: Perform CodeQL Analysis
97-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
100+
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
98101
with:
99102
upload: false # disable the upload here - we will upload in a different action
100103
category: "/language:${{matrix.language}}"
@@ -110,7 +113,7 @@ jobs:
110113
output: sarif-results/${{ matrix.language }}.sarif
111114

112115
- name: Upload SARIF
113-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
116+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
114117
with:
115118
sarif_file: sarif-results/${{ matrix.language }}.sarif
116119

‎.github/workflows/dependency-review.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ permissions:
1414

1515
jobs:
1616
dependency-review:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
20+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
2121
with:
2222
egress-policy: audit
2323

‎.github/workflows/install_dependencies.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ if [[ "${BUILD_DOCU}x" != "x" ]]; then
5050
fi
5151

5252
if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then
53-
echo "!!!!!!! Ubunut 20.04 and python 3.10: compile boost 1.80 !!!!!!!"
53+
echo "!!!!!!! Ubunut 20.04 and python 3.10: compile boost 1.78 !!!!!!!"
5454
pushd dependencies
5555

5656
BOOST_VERSION=1.78.0
5757
BOOST_PACKAGE_BASENAME=boost_${BOOST_VERSION//./_}
58-
wget "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz"
58+
wget "https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz"
5959

6060
tar -xzf ${BOOST_PACKAGE_BASENAME}.tar.gz
6161
pushd ${BOOST_PACKAGE_BASENAME}
@@ -85,4 +85,4 @@ if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then
8585
fi
8686

8787
sudo apt remove python3-pygments
88-
sudo pip${PYTHON_BINDING_VERSION} install -r .github/workflows/requirements.txt
88+
sudo python${PYTHON_BINDING_VERSION} -m pip install -r .github/workflows/requirements.txt

‎.github/workflows/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mdx_truly_sane_lists==1.3
55
mkdocs==1.6.1
66
pygccxml==2.6.1
77
Pygments==2.18.0
8-
pymdown-extensions==10.13
8+
pymdown-extensions==10.14.3
99
pyplusplus==1.8.5
1010
setuptools==75.8.0
1111
six==1.17.0

‎.github/workflows/scorecards.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions: read-all
2020
jobs:
2121
analysis:
2222
name: Scorecard analysis
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-22.04
2424
permissions:
2525
# Needed to upload the results to code-scanning dashboard.
2626
security-events: write
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
34+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
3535
with:
3636
egress-policy: audit
3737

@@ -63,14 +63,14 @@ jobs:
6363
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6464
# format to the repository Actions tab.
6565
- name: "Upload artifact"
66-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
66+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6767
with:
6868
name: SARIF file
6969
path: results.sarif
7070
retention-days: 5
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
74+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
7575
with:
7676
sarif_file: results.sarif

‎.github/workflows/wheels.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
PYTHON_BINDING_VERSION: ${{ matrix.PYTHON_BINDING_VERSION }}
2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
29+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
3030
with:
3131
egress-policy: audit
3232

@@ -60,7 +60,7 @@ jobs:
6060
done
6161
6262
- name: Publish wheels to PyPI
63-
uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # release/v1
63+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
6464
if: ${{ github.event_name == 'release'}}
6565
with:
6666
user: __token__

‎ad_rss/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# SPDX-License-Identifier: LGPL-2.1-only
66
#
77
# ----------------- END LICENSE BLOCK -----------------------------------
8-
cmake_minimum_required(VERSION 3.5)
8+
cmake_minimum_required(VERSION 3.10)
99

1010
include(../cmake/ad-rss-lib-version.cmake)
1111
project(ad_rss VERSION ${AD-RSS-LIB_VERSION})
@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers)
2626
set(ad_rss_TARGET_INCLUDE_DIRECTORIES)
2727
set(ad_rss_TARGET_LINK_LIBRARIES)
2828

29-
find_package(Boost REQUIRED)
29+
find_package(Boost CONFIG REQUIRED)
3030
list(APPEND ad_rss_TARGET_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
3131
list(APPEND ad_rss_TARGET_LINK_LIBRARIES ${Boost_LIBRARIES})
3232

‎ad_rss/cmake/Config.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
include(CMakeFindDependencyMacro)
1919

20-
find_package(Boost REQUIRED)
20+
find_package(Boost CONFIG REQUIRED)
2121
list(APPEND INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
2222
list(APPEND LIBRARIES ${Boost_LIBRARIES})
2323

‎ad_rss/python/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ get_target_property(AD_PHYSICS_INCLUDES ad_physics INTERFACE_INCLUDE_DIRECTORIES
1616
find_package(spdlog REQUIRED CONFIG)
1717
get_target_property(SPDLOG_INCLUDES spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
1818

19-
find_package(Boost REQUIRED)
19+
find_package(Boost CONFIG REQUIRED)
2020

2121
list(APPEND INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${AD_PHYSICS_INCLUDES} ${SPDLOG_INCLUDES})
2222

‎ad_rss_map_integration/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# ----------------- END LICENSE BLOCK -----------------------------------
88

9-
cmake_minimum_required(VERSION 3.5)
9+
cmake_minimum_required(VERSION 3.10)
1010

1111
include(../cmake/ad-rss-lib-version.cmake)
1212
project(ad_rss_map_integration VERSION ${AD-RSS-LIB_VERSION})

‎cmake/python-binding.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ function(find_python_binding_packages)
4343
find_package(PythonLibs EXACT "${PYTHON_BINDING_VERSION}" REQUIRED)
4444
endif()
4545

46-
find_package(Boost REQUIRED)
46+
find_package(Boost CONFIG REQUIRED)
4747
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_GREATER 1.66)
4848
set(BOOST_PYTHON_COMPONENT python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
4949
else()
5050
set(BOOST_PYTHON_COMPONENT python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
5151
endif()
52-
find_package(Boost COMPONENTS REQUIRED ${BOOST_PYTHON_COMPONENT})
52+
find_package(Boost CONFIG COMPONENTS REQUIRED ${BOOST_PYTHON_COMPONENT})
5353

5454
set(PYTHON_BINDING_NAME
5555
"python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}"

‎dependencies/map

0 commit comments

Comments
 (0)