Skip to content

Commit a4f803b

Browse files
authored
Added release tag for samples, fixed branch of doc8 check
2 parents 57c2c92 + c707cd4 commit a4f803b

File tree

9 files changed

+82
-71
lines changed

9 files changed

+82
-71
lines changed

.appveyor.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ environment:
2020
LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
2121
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
2222
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
23+
SAMPLES_TAG: 2021.3.0
2324

2425
matrix:
2526
- job_name: build_windows_cpp
@@ -63,7 +64,7 @@ for:
6364
install:
6465
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_CPP_COMPONENTS%
6566
build_script:
66-
cmd: scripts/build_windows.bat c++
67+
cmd: scripts/build_windows.bat c++ "" %SAMPLES_TAG%
6768

6869
# Delete the following if you don't want to save install logs
6970
artifacts:
@@ -79,7 +80,7 @@ for:
7980
install:
8081
cmd: scripts/install_windows.bat %WINDOWS_HPCKIT_URL% %WINDOWS_FORTRAN_COMPONENTS%
8182
build_script:
82-
cmd: scripts/build_windows.bat fortran
83+
cmd: scripts/build_windows.bat fortran "" %SAMPLES_TAG%
8384

8485
# Delete the following if you don't want to save install logs
8586
artifacts:
@@ -95,7 +96,7 @@ for:
9596
install:
9697
cmd: scripts/install_windows.bat %WINDOWS_BASEKIT_URL% %WINDOWS_DPCPP_COMPONENTS%
9798
build_script:
98-
cmd: scripts/build_windows.bat dpc++
99+
cmd: scripts/build_windows.bat dpc++ "" %SAMPLES_TAG%
99100

100101
# Delete the following if you don't want to save install logs
101102
artifacts:
@@ -112,7 +113,7 @@ for:
112113
sh: |
113114
scripts/install_linux.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
114115
build_script:
115-
sh: scripts/build_linux.sh c++
116+
sh: scripts/build_linux.sh c++ $SAMPLES_TAG
116117

117118
# Delete the following if you don't want to save install logs
118119
artifacts:
@@ -130,7 +131,7 @@ for:
130131
sh: |
131132
scripts/install_linux.sh $LINUX_HPCKIT_URL $LINUX_FORTRAN_COMPONENTS_WEB
132133
build_script:
133-
sh: scripts/build_linux.sh fortran
134+
sh: scripts/build_linux.sh fortran $SAMPLES_TAG
134135

135136
# Delete the following if you don't want to save install logs
136137
artifacts:
@@ -148,7 +149,7 @@ for:
148149
sh: |
149150
scripts/install_linux.sh $LINUX_BASEKIT_URL $LINUX_DPCPP_COMPONENTS_WEB
150151
build_script:
151-
sh: scripts/build_linux.sh dpc++
152+
sh: scripts/build_linux.sh dpc++ $SAMPLES_TAG
152153

153154
# Delete the following if you don't want to save install logs
154155
artifacts:
@@ -167,7 +168,7 @@ for:
167168
scripts/setup_apt_repo_linux.sh
168169
scripts/install_linux_apt.sh $LINUX_CPP_COMPONENTS
169170
build_script:
170-
sh: scripts/build_linux.sh c++
171+
sh: scripts/build_linux.sh c++ $SAMPLES_TAG
171172
-
172173
matrix:
173174
only:
@@ -177,7 +178,7 @@ for:
177178
scripts/setup_apt_repo_linux.sh
178179
scripts/install_linux_apt.sh $LINUX_FORTRAN_COMPONENTS
179180
build_script:
180-
sh: scripts/build_linux.sh fortran
181+
sh: scripts/build_linux.sh fortran $SAMPLES_TAG
181182
-
182183
matrix:
183184
only:
@@ -187,7 +188,7 @@ for:
187188
scripts/setup_apt_repo_linux.sh
188189
scripts/install_linux_apt.sh $LINUX_DPCPP_COMPONENTS
189190
build_script:
190-
sh: scripts/build_linux.sh dpc++
191+
sh: scripts/build_linux.sh dpc++ $SAMPLES_TAG
191192

192193
-
193194
matrix:
@@ -196,7 +197,7 @@ for:
196197
install:
197198
sh: scripts/install_macos.sh $MACOS_HPCKIT_URL $MACOS_CPP_COMPONENTS
198199
build_script:
199-
sh: scripts/build_macos.sh c++
200+
sh: scripts/build_macos.sh c++ $SAMPLES_TAG
200201

201202
# Delete the following if you don't want to save install logs
202203
artifacts:
@@ -211,7 +212,7 @@ for:
211212
install:
212213
sh: scripts/install_macos.sh $MACOS_HPCKIT_URL $MACOS_FORTRAN_COMPONENTS
213214
build_script:
214-
sh: scripts/build_macos.sh fortran
215+
sh: scripts/build_macos.sh fortran $SAMPLES_TAG
215216

216217
# Delete the following if you don't want to save install logs
217218
artifacts:

.azure-pipelines.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ variables:
3838
value: intel.oneapi.mac.cpp-compiler
3939
- name: MACOS_FORTRAN_COMPONENTS
4040
value: intel.oneapi.mac.ifort-compiler
41+
- name: SAMPLES_TAG
42+
value: 2021.3.0
4143

4244
resources:
4345
containers:
@@ -61,7 +63,7 @@ jobs:
6163
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_CPP_COMPONENTS)
6264
displayName: install
6365
condition: ne(variables.CACHE_RESTORED, 'true')
64-
- script: scripts/build_windows.bat c++
66+
- script: scripts/build_windows.bat c++ "" $(SAMPLES_TAG)
6567
displayName: build
6668
- bash: scripts/cache_exclude_windows.sh
6769
displayName: exclude unused files from cache
@@ -95,7 +97,7 @@ jobs:
9597
- script: scripts/install_windows.bat $(WINDOWS_HPCKIT_URL) $(WINDOWS_FORTRAN_COMPONENTS)
9698
displayName: install
9799
condition: ne(variables.CACHE_RESTORED, 'true')
98-
- script: scripts/build_windows.bat fortran
100+
- script: scripts/build_windows.bat fortran "" $(SAMPLES_TAG)
99101
displayName: build
100102
- bash: scripts/cache_exclude_windows.sh
101103
displayName: exclude unused files from cache
@@ -144,7 +146,7 @@ jobs:
144146
- bash: cp opencl/OpenCL.dll C:/Windows/System32/
145147
displayName: restore OpenCL.dll from cache
146148
condition: eq(variables.CACHE_RESTORED, 'true')
147-
- script: scripts/build_windows.bat dpc++
149+
- script: scripts/build_windows.bat dpc++ "" $(SAMPLES_TAG)
148150
displayName: build
149151
- bash: scripts/cache_exclude_windows.sh
150152
displayName: exclude unused files from cache
@@ -183,7 +185,7 @@ jobs:
183185
- script: scripts/install_linux.sh $(LINUX_HPCKIT_URL) $(LINUX_CPP_COMPONENTS_WEB)
184186
displayName: install
185187
condition: ne(variables.CACHE_RESTORED, 'true')
186-
- script: scripts/build_linux.sh c++
188+
- script: scripts/build_linux.sh c++ $(SAMPLES_TAG)
187189
displayName: build
188190
- bash: scripts/cache_exclude_linux.sh
189191
displayName: exclude unused files from cache
@@ -217,7 +219,7 @@ jobs:
217219
- script: scripts/install_linux.sh $(LINUX_HPCKIT_URL) $(LINUX_FORTRAN_COMPONENTS_WEB)
218220
displayName: install
219221
condition: ne(variables.CACHE_RESTORED, 'true')
220-
- script: scripts/build_linux.sh fortran
222+
- script: scripts/build_linux.sh fortran $(SAMPLES_TAG)
221223
displayName: build
222224
- bash: scripts/cache_exclude_linux.sh
223225
displayName: exclude unused files from cache
@@ -255,7 +257,7 @@ jobs:
255257
- script: scripts/install_linux.sh $(LINUX_BASEKIT_URL) $(LINUX_DPCPP_COMPONENTS_WEB)
256258
displayName: install
257259
condition: ne(variables.CACHE_RESTORED, 'true')
258-
- script: scripts/build_linux.sh dpc++
260+
- script: scripts/build_linux.sh dpc++ $(SAMPLES_TAG)
259261
displayName: build
260262
- bash: scripts/cache_exclude_linux.sh
261263
displayName: exclude unused files from cache
@@ -293,7 +295,7 @@ jobs:
293295
- script: scripts/install_linux_apt.sh $(LINUX_CPP_COMPONENTS)
294296
displayName: install
295297
condition: ne(variables.CACHE_RESTORED, 'true')
296-
- script: scripts/build_linux.sh c++
298+
- script: scripts/build_linux.sh c++ $(SAMPLES_TAG)
297299
displayName: build
298300
- bash: scripts/cache_exclude_linux.sh
299301
displayName: exclude unused files from cache
@@ -315,7 +317,7 @@ jobs:
315317
- script: scripts/install_linux_apt.sh $(LINUX_FORTRAN_COMPONENTS)
316318
displayName: install
317319
condition: ne(variables.CACHE_RESTORED, 'true')
318-
- script: scripts/build_linux.sh fortran
320+
- script: scripts/build_linux.sh fortran $(SAMPLES_TAG)
319321
displayName: build
320322
- bash: scripts/cache_exclude_linux.sh
321323
displayName: exclude unused files from cache
@@ -341,7 +343,7 @@ jobs:
341343
- script: scripts/install_linux_apt.sh $(LINUX_DPCPP_COMPONENTS)
342344
displayName: install
343345
condition: ne(variables.CACHE_RESTORED, 'true')
344-
- script: scripts/build_linux.sh dpc++
346+
- script: scripts/build_linux.sh dpc++ $(SAMPLES_TAG)
345347
displayName: build
346348
- bash: scripts/cache_exclude_linux.sh
347349
displayName: exclude unused files from cache
@@ -361,7 +363,7 @@ jobs:
361363
- script: scripts/install_linux_dnf.sh $(LINUX_CPP_COMPONENTS)
362364
displayName: install
363365
condition: ne(variables.CACHE_RESTORED, 'true')
364-
- script: scripts/build_linux.sh c++
366+
- script: scripts/build_linux.sh c++ $(SAMPLES_TAG)
365367
displayName: build
366368

367369
- job: build_linux_dnf_fortran
@@ -378,7 +380,7 @@ jobs:
378380
- script: scripts/install_linux_dnf.sh $(LINUX_FORTRAN_COMPONENTS)
379381
displayName: install
380382
condition: ne(variables.CACHE_RESTORED, 'true')
381-
- script: scripts/build_linux.sh fortran
383+
- script: scripts/build_linux.sh fortran $(SAMPLES_TAG)
382384
displayName: build
383385

384386
- job: build_linux_dnf_dpcpp
@@ -395,7 +397,7 @@ jobs:
395397
- script: scripts/install_linux_dnf.sh $(LINUX_DPCPP_COMPONENTS)
396398
displayName: install
397399
condition: ne(variables.CACHE_RESTORED, 'true')
398-
- script: scripts/build_linux.sh dpc++
400+
- script: scripts/build_linux.sh dpc++ $(SAMPLES_TAG)
399401
displayName: build
400402

401403
- job: build_macOS_cpp
@@ -414,7 +416,7 @@ jobs:
414416
- script: scripts/install_macos.sh $(MACOS_HPCKIT_URL) $(MACOS_CPP_COMPONENTS)
415417
displayName: install
416418
condition: ne(variables.CACHE_RESTORED, 'true')
417-
- script: scripts/build_macos.sh c++
419+
- script: scripts/build_macos.sh c++ $(SAMPLES_TAG)
418420
displayName: build
419421

420422
# Delete the following if you don't want to save install logs
@@ -448,7 +450,7 @@ jobs:
448450
- script: scripts/install_macos.sh $(MACOS_HPCKIT_URL) $(MACOS_FORTRAN_COMPONENTS)
449451
displayName: install
450452
condition: ne(variables.CACHE_RESTORED, 'true')
451-
- script: scripts/build_macos.sh fortran
453+
- script: scripts/build_macos.sh fortran $(SAMPLES_TAG)
452454
displayName: build
453455

454456
# Delete the following if you don't want to save install logs

.circleci/config.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ parameters:
4343
LINUX_DPCPP_COMPONENTS_WEB:
4444
type: string
4545
default: "intel.oneapi.lin.dpcpp-cpp-compiler"
46+
SAMPLES_TAG:
47+
type: string
48+
default: "2021.3.0"
4649

4750
orbs:
4851
win: circleci/[email protected]
@@ -64,7 +67,7 @@ jobs:
6467
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_CPP_COMPONENTS >>
6568
- run:
6669
name: build
67-
command: scripts/build_windows.bat c++ 2017_build_tools
70+
command: scripts/build_windows.bat c++ 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
6871
- run:
6972
name: exclude unused files from cache
7073
command: scripts/cache_exclude_windows.sh
@@ -98,7 +101,7 @@ jobs:
98101
scripts/install_windows.bat << pipeline.parameters.WINDOWS_HPCKIT_URL >> << pipeline.parameters.WINDOWS_FORTRAN_COMPONENTS >>
99102
- run:
100103
name: build
101-
command: scripts/build_windows.bat fortran 2017_build_tools
104+
command: scripts/build_windows.bat fortran 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
102105
- run:
103106
name: exclude unused files from cache
104107
command: scripts/cache_exclude_windows.sh
@@ -132,7 +135,7 @@ jobs:
132135
scripts/install_windows.bat << pipeline.parameters.WINDOWS_BASEKIT_URL >> << pipeline.parameters.WINDOWS_DPCPP_COMPONENTS >>
133136
- run:
134137
name: build
135-
command: scripts/build_windows.bat dpc++ 2017_build_tools
138+
command: scripts/build_windows.bat dpc++ 2017_build_tools << pipeline.parameters.SAMPLES_TAG >>
136139
- run:
137140
name: exclude unused files from cache
138141
command: scripts/cache_exclude_windows.sh
@@ -170,7 +173,7 @@ jobs:
170173
. scripts/install_linux_no_sudo.sh << pipeline.parameters.LINUX_HPCKIT_URL >> << pipeline.parameters.LINUX_CPP_COMPONENTS_WEB >>
171174
- run:
172175
name: build
173-
command: scripts/build_linux.sh c++
176+
command: scripts/build_linux.sh c++ << pipeline.parameters.SAMPLES_TAG >>
174177
- run:
175178
name: exclude unused files from cache
176179
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -206,7 +209,7 @@ jobs:
206209
. scripts/install_linux_no_sudo.sh << pipeline.parameters.LINUX_HPCKIT_URL >> << pipeline.parameters.LINUX_FORTRAN_COMPONENTS_WEB >>
207210
- run:
208211
name: build
209-
command: scripts/build_linux.sh fortran
212+
command: scripts/build_linux.sh fortran << pipeline.parameters.SAMPLES_TAG >>
210213
- run:
211214
name: exclude unused files from cache
212215
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -242,7 +245,7 @@ jobs:
242245
. scripts/install_linux_no_sudo.sh << pipeline.parameters.LINUX_BASEKIT_URL >> << pipeline.parameters.LINUX_DPCPP_COMPONENTS_WEB >>
243246
- run:
244247
name: build
245-
command: scripts/build_linux.sh dpc++
248+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.SAMPLES_TAG >>
246249
- run:
247250
name: exclude unused files from cache
248251
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -285,7 +288,7 @@ jobs:
285288
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_CPP_COMPONENTS >>
286289
- run:
287290
name: build
288-
command: scripts/build_linux.sh c++
291+
command: scripts/build_linux.sh c++ << pipeline.parameters.SAMPLES_TAG >>
289292
- run:
290293
name: exclude unused files from cache
291294
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -318,7 +321,7 @@ jobs:
318321
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_FORTRAN_COMPONENTS >>
319322
- run:
320323
name: build
321-
command: scripts/build_linux.sh fortran
324+
command: scripts/build_linux.sh fortran << pipeline.parameters.SAMPLES_TAG >>
322325
- run:
323326
name: exclude unused files from cache
324327
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -351,7 +354,7 @@ jobs:
351354
. scripts/install_linux_apt_no_sudo.sh << pipeline.parameters.LINUX_DPCPP_COMPONENTS >>
352355
- run:
353356
name: build
354-
command: scripts/build_linux.sh dpc++
357+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.SAMPLES_TAG >>
355358
- run:
356359
name: exclude unused files from cache
357360
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -385,7 +388,7 @@ jobs:
385388
. scripts/install_linux_dnf_no_sudo.sh << pipeline.parameters.LINUX_CPP_COMPONENTS >>
386389
- run:
387390
name: build
388-
command: scripts/build_linux.sh c++
391+
command: scripts/build_linux.sh c++ << pipeline.parameters.SAMPLES_TAG >>
389392
- run:
390393
name: exclude unused files from cache
391394
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -418,7 +421,7 @@ jobs:
418421
. scripts/install_linux_dnf_no_sudo.sh << pipeline.parameters.LINUX_FORTRAN_COMPONENTS >>
419422
- run:
420423
name: build
421-
command: scripts/build_linux.sh fortran
424+
command: scripts/build_linux.sh fortran << pipeline.parameters.SAMPLES_TAG >>
422425
- run:
423426
name: exclude unused files from cache
424427
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -451,7 +454,7 @@ jobs:
451454
. scripts/install_linux_dnf_no_sudo.sh << pipeline.parameters.LINUX_DPCPP_COMPONENTS >>
452455
- run:
453456
name: build
454-
command: scripts/build_linux.sh dpc++
457+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.SAMPLES_TAG >>
455458
- run:
456459
name: exclude unused files from cache
457460
command: . scripts/cache_exclude_linux_no_sudo.sh
@@ -471,7 +474,7 @@ jobs:
471474
- checkout
472475
- run:
473476
name: build
474-
command: scripts/build_linux.sh c++
477+
command: scripts/build_linux.sh c++ << pipeline.parameters.SAMPLES_TAG >>
475478

476479
build_linux_container_fortran:
477480
docker:
@@ -483,7 +486,7 @@ jobs:
483486
- checkout
484487
- run:
485488
name: build
486-
command: scripts/build_linux.sh fortran
489+
command: scripts/build_linux.sh fortran << pipeline.parameters.SAMPLES_TAG >>
487490

488491
build_linux_container_dpcpp:
489492
docker:
@@ -495,7 +498,7 @@ jobs:
495498
- checkout
496499
- run:
497500
name: build
498-
command: scripts/build_linux.sh dpc++
501+
command: scripts/build_linux.sh dpc++ << pipeline.parameters.SAMPLES_TAG >>
499502

500503
workflows:
501504
build-all:

0 commit comments

Comments
 (0)