Skip to content

Commit 1a94bf0

Browse files
authored
Merge branch 'master' into an/update-docs
2 parents c0ead74 + bd68b78 commit 1a94bf0

File tree

15 files changed

+48
-44
lines changed

15 files changed

+48
-44
lines changed

.github/workflows/mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
brew install ninja mpich llvm libomp openssl
6565
brew link libomp --overwrite --force
6666
- name: Download installed package
67-
uses: actions/download-artifact@v5
67+
uses: actions/download-artifact@v6
6868
with:
6969
name: macos-clang-install
7070
- name: Extract installed package
@@ -95,7 +95,7 @@ jobs:
9595
brew install ninja mpich llvm libomp openssl
9696
brew link libomp --overwrite --force
9797
- name: Download installed package
98-
uses: actions/download-artifact@v5
98+
uses: actions/download-artifact@v6
9999
with:
100100
name: macos-clang-install
101101
- name: Extract installed package

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ permissions: read-all
99

1010
jobs:
1111
analysis:
12+
if: ${{ github.repository == 'learning-process/parallel_programming_course' }}
1213
name: Scorecard analysis
1314
runs-on: ubuntu-latest
1415
permissions:
@@ -26,7 +27,7 @@ jobs:
2627
results_format: sarif
2728
publish_results: true
2829
- name: Upload artifact
29-
uses: actions/upload-artifact@v4
30+
uses: actions/upload-artifact@v5
3031
with:
3132
name: SARIF file
3233
path: results.sarif

.github/workflows/pages.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Run Doxygen
2323
run: doxygen Doxyfile
2424
- name: Upload Doxygen documentation
25-
uses: actions/upload-artifact@v4
25+
uses: actions/upload-artifact@v5
2626
with:
2727
name: doxygen-documentation-xml
2828
path: xml
@@ -46,7 +46,7 @@ jobs:
4646
python3 -m pip install -r docs/requirements.txt
4747
python3 -m pip install graphviz pyyaml
4848
- name: Download artifact
49-
uses: actions/download-artifact@v5
49+
uses: actions/download-artifact@v6
5050
with:
5151
name: doxygen-documentation-xml
5252
path: xml
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
cmake --build build -t docs_html -- --quiet
6666
- name: Upload artifact
67-
uses: actions/upload-artifact@v4
67+
uses: actions/upload-artifact@v5
6868
with:
6969
name: sphinx-documentation
7070
path: ./build/docs/_build/html
@@ -82,7 +82,7 @@ jobs:
8282
python3 -m pip install -r requirements.txt
8383
python3 -m pip install -r scoreboard/requirements.txt
8484
- name: Download performance data
85-
uses: actions/download-artifact@v5
85+
uses: actions/download-artifact@v6
8686
with:
8787
name: perf-stat
8888
- name: Extract performance data
@@ -102,12 +102,12 @@ jobs:
102102
run: |
103103
cmake --build build --parallel -- --quiet
104104
- name: Upload artifact
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v5
106106
with:
107107
name: scoreboard
108108
path: ./build/scoreboard/html/
109109
deploy-pages:
110-
if: github.ref == 'refs/heads/master'
110+
if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/master' }}
111111
needs:
112112
- build-sphinx
113113
- build-scoreboard
@@ -119,17 +119,17 @@ jobs:
119119
cancel-in-progress: false
120120
steps:
121121
- name: Download artifact
122-
uses: actions/download-artifact@v5
122+
uses: actions/download-artifact@v6
123123
with:
124124
name: sphinx-documentation
125125
path: ./
126126
- name: Download artifact
127-
uses: actions/download-artifact@v5
127+
uses: actions/download-artifact@v6
128128
with:
129129
name: scoreboard
130130
path: ./scoreboard/
131131
- name: Download coverage artifact
132-
uses: actions/download-artifact@v5
132+
uses: actions/download-artifact@v6
133133
with:
134134
name: cov-report
135135
path: ./coverage/

.github/workflows/perf.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: |
2020
python3 -m pip install -r requirements.txt --break-system-packages --ignore-installed
2121
- name: Download installed package
22-
uses: actions/download-artifact@v5
22+
uses: actions/download-artifact@v6
2323
with:
2424
name: ubuntu-gcc-install-ubuntu-24.04
2525
- name: Extract installed package
@@ -38,7 +38,7 @@ jobs:
3838
working-directory: build
3939
run: zip -r ../perf-stat.zip perf_stat_dir
4040
- name: Upload results
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v5
4242
with:
4343
name: perf-stat
4444
path: perf-stat.zip
@@ -57,7 +57,7 @@ jobs:
5757
brew link libomp --overwrite --force
5858
python3 -m pip install -r requirements.txt --break-system-packages
5959
- name: Download installed package
60-
uses: actions/download-artifact@v5
60+
uses: actions/download-artifact@v6
6161
with:
6262
name: macos-clang-install
6363
- name: Extract installed package
@@ -74,7 +74,7 @@ jobs:
7474
working-directory: build
7575
run: zip -r perf-stat-macos.zip perf_stat_dir
7676
- name: Upload results
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: perf-stat-macos
8080
path: perf-stat-macos.zip

.github/workflows/ubuntu.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
CC: gcc-14
3636
CXX: g++-14
3737
- name: Archive revert list
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@v5
3939
if: ${{ matrix.os == 'ubuntu-24.04' && matrix.build_type == 'Release' }}
4040
with:
4141
name: revert-list
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- uses: actions/checkout@v5
7575
- name: Download installed package
76-
uses: actions/download-artifact@v5
76+
uses: actions/download-artifact@v6
7777
with:
7878
name: ubuntu-gcc-install-${{ matrix.os }}
7979
- name: Extract installed package
@@ -105,7 +105,7 @@ jobs:
105105
steps:
106106
- uses: actions/checkout@v5
107107
- name: Download installed package
108-
uses: actions/download-artifact@v5
108+
uses: actions/download-artifact@v6
109109
with:
110110
name: ubuntu-gcc-install-${{ matrix.os }}
111111
- name: Extract installed package
@@ -174,7 +174,7 @@ jobs:
174174
steps:
175175
- uses: actions/checkout@v5
176176
- name: Download installed package
177-
uses: actions/download-artifact@v5
177+
uses: actions/download-artifact@v6
178178
with:
179179
name: ubuntu-clang-install-${{ matrix.os }}
180180
- name: Extract installed package
@@ -206,7 +206,7 @@ jobs:
206206
steps:
207207
- uses: actions/checkout@v5
208208
- name: Download installed package
209-
uses: actions/download-artifact@v5
209+
uses: actions/download-artifact@v6
210210
with:
211211
name: ubuntu-clang-install-${{ matrix.os }}
212212
- name: Extract installed package
@@ -279,7 +279,7 @@ jobs:
279279
steps:
280280
- uses: actions/checkout@v5
281281
- name: Download installed package
282-
uses: actions/download-artifact@v5
282+
uses: actions/download-artifact@v6
283283
with:
284284
name: ubuntu-clang-sanitizer-install-${{ matrix.os }}
285285
- name: Extract installed package
@@ -317,7 +317,7 @@ jobs:
317317
steps:
318318
- uses: actions/checkout@v5
319319
- name: Download installed package
320-
uses: actions/download-artifact@v5
320+
uses: actions/download-artifact@v6
321321
with:
322322
name: ubuntu-clang-sanitizer-install-${{ matrix.os }}
323323
- name: Extract installed package
@@ -397,7 +397,7 @@ jobs:
397397
token: ${{ secrets.CODECOV_TOKEN }}
398398
- name: Upload coverage report artifact
399399
id: upload-cov
400-
uses: actions/upload-artifact@v4
400+
uses: actions/upload-artifact@v5
401401
with:
402402
name: cov-report
403403
path: 'cov-report'

.github/workflows/update-pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions:
1414

1515
jobs:
1616
update-pre-commit:
17+
if: ${{ github.repository == 'learning-process/parallel_programming_course' }}
1718
runs-on: ubuntu-latest
1819
steps:
1920
- name: Checkout repository

.github/workflows/windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v5
5151
- uses: ./.github/actions/setup-windows-toolchain
5252
- name: Download installed package
53-
uses: actions/download-artifact@v5
53+
uses: actions/download-artifact@v6
5454
with:
5555
name: windows-msvc-install
5656
- name: Extract installed package
@@ -75,7 +75,7 @@ jobs:
7575
- uses: actions/checkout@v5
7676
- uses: ./.github/actions/setup-windows-toolchain
7777
- name: Download installed package
78-
uses: actions/download-artifact@v5
78+
uses: actions/download-artifact@v6
7979
with:
8080
name: windows-msvc-install
8181
- name: Extract installed package
@@ -137,7 +137,7 @@ jobs:
137137
- uses: actions/checkout@v5
138138
- uses: ./.github/actions/setup-windows-toolchain
139139
- name: Download installed package
140-
uses: actions/download-artifact@v5
140+
uses: actions/download-artifact@v6
141141
with:
142142
name: windows-clang-install
143143
- name: Extract installed package
@@ -158,7 +158,7 @@ jobs:
158158
- uses: actions/checkout@v5
159159
- uses: ./.github/actions/setup-windows-toolchain
160160
- name: Download installed package
161-
uses: actions/download-artifact@v5
161+
uses: actions/download-artifact@v6
162162
with:
163163
name: windows-clang-install
164164
- name: Extract installed package

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222

2323
# Ruff Python linter
2424
- repo: https://github.com/charliermarsh/ruff-pre-commit
25-
rev: v0.14.1
25+
rev: v0.14.2
2626
hooks:
2727
- id: ruff
2828
args: [--fix]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Welcome to the Parallel Programming Course!
1010

11-
For more detailed documentation and resources, please visit documentation pages: [en](https://learning-process.github.io/parallel_programming_course/en/), [ru](https://learning-process.github.io/parallel_programming_course/ru/).
11+
For more detailed documentation and resources, please visit documentation pages: [en](https://learning-process.github.io/parallel_programming_course/en/), [ru](https://learning-process.github.io/parallel_programming_course/ru/). Course slides are available [here](https://learning-process.github.io/parallel_programming_slides/).
1212

1313
Course scoreboard is available [here](https://learning-process.github.io/parallel_programming_course/scoreboard/).
1414

cmake/gtest.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ExternalProject_Add(
1919
$<$<BOOL:MSVC>:-Dgtest_force_shared_crt=ON>
2020
BUILD_COMMAND
2121
"${CMAKE_COMMAND}" --build
22-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config
23-
${CMAKE_BUILD_TYPE} --parallel
22+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
23+
--parallel
2424
INSTALL_COMMAND
2525
"${CMAKE_COMMAND}" --install
26-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --prefix
27-
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
26+
"${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/build" --config $<CONFIG>
27+
--prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_googletest/install")
2828

2929
function(ppc_link_gtest exec_func_lib)
3030
# Add external project include directories

0 commit comments

Comments
 (0)