Skip to content

Commit 178f09a

Browse files
authored
Merge pull request #22 from rscohn2/dev/checks
add more checks and fix issues
2 parents dd3d607 + c23cebd commit 178f09a

17 files changed

+150
-99
lines changed

.appveyor.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@ environment:
1515
LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler
1616
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
1717
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
18-
18+
1919
matrix:
2020
- job_name: build_windows_cpp
2121
appveyor_build_worker_image: Visual Studio 2019
22-
22+
2323
- job_name: build_windows_fortran
2424
appveyor_build_worker_image: Visual Studio 2019
25-
25+
2626
- job_name: build_windows_dpcpp
2727
appveyor_build_worker_image: Visual Studio 2019
28-
28+
2929
- job_name: build_linux_apt_cpp
3030
appveyor_build_worker_image: Ubuntu
31-
31+
3232
- job_name: build_linux_apt_fortran
3333
appveyor_build_worker_image: Ubuntu
34-
34+
3535
- job_name: build_linux_apt_dpcpp
3636
appveyor_build_worker_image: Ubuntu
37-
37+
3838
- job_name: build_mac_cpp
3939
appveyor_build_worker_image: macos
40-
40+
4141
- job_name: build_mac_fortran
4242
appveyor_build_worker_image: macos
43-
43+
4444
for:
4545
-
4646
matrix:
@@ -108,7 +108,7 @@ for:
108108
sh: scripts/install_linux_apt.sh $LINUX_DPCPP_COMPONENTS
109109
build_script:
110110
sh: scripts/build_linux.sh dpc++
111-
111+
112112
-
113113
matrix:
114114
only:
@@ -134,4 +134,4 @@ for:
134134
- name: InstallLogs
135135
path: |
136136
bootstrapper*
137-
installer*
137+
installer*

.azure-pipelines.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ resources:
3737
- container: oneapi-basekit
3838
image: intel/oneapi-basekit:latest
3939
options: '-v /usr/bin/sudo:/usr/bin/sudo -v /usr/lib/sudo/libsudo_util.so.0:/usr/lib/sudo/libsudo_util.so.0 -v /usr/lib/sudo/sudoers.so:/usr/lib/sudo/sudoers.so'
40-
40+
4141
jobs:
4242
- job: build_windows_cpp
4343
pool:
@@ -61,7 +61,7 @@ jobs:
6161
inputs:
6262
pathToPublish: '$(Build.ArtifactStagingDirectory)'
6363
artifactName: InstallLogs_$(Agent.JobName)
64-
64+
6565
- job: build_windows_fortran
6666
pool:
6767
vmImage: 'windows-latest'
@@ -84,7 +84,7 @@ jobs:
8484
inputs:
8585
pathToPublish: '$(Build.ArtifactStagingDirectory)'
8686
artifactName: InstallLogs_$(Agent.JobName)
87-
87+
8888
- job: build_windows_dpcpp
8989
pool:
9090
vmImage: 'windows-latest'
@@ -107,7 +107,7 @@ jobs:
107107
inputs:
108108
pathToPublish: '$(Build.ArtifactStagingDirectory)'
109109
artifactName: InstallLogs_$(Agent.JobName)
110-
110+
111111
- job: build_linux_apt_cpp
112112
pool:
113113
vmImage: 'ubuntu-latest'
@@ -116,7 +116,7 @@ jobs:
116116
displayName: install
117117
- script: scripts/build_linux.sh c++
118118
displayName: build
119-
119+
120120
- job: build_linux_apt_fortran
121121
pool:
122122
vmImage: 'ubuntu-latest'
@@ -144,7 +144,7 @@ jobs:
144144
displayName: install_git
145145
- script: scripts/build_linux.sh c++
146146
displayName: build
147-
147+
148148
- job: build_linux_container_fortran
149149
pool:
150150
vmImage: 'ubuntu-20.04'
@@ -186,7 +186,7 @@ jobs:
186186
inputs:
187187
pathToPublish: '$(Build.ArtifactStagingDirectory)'
188188
artifactName: InstallLogs_$(Agent.JobName)
189-
189+
190190
- job: build_macOS_fortran
191191
pool:
192192
vmImage: 'macOS-latest'
@@ -208,4 +208,3 @@ jobs:
208208
inputs:
209209
pathToPublish: '$(Build.ArtifactStagingDirectory)'
210210
artifactName: InstallLogs_$(Agent.JobName)
211-

.circleci/config.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
when: always
2828
- store_artifacts:
2929
path: InstallLogs
30-
30+
3131
build_windows_fortran:
3232
executor:
3333
name: win/default
@@ -47,7 +47,7 @@ jobs:
4747
when: always
4848
- store_artifacts:
4949
path: InstallLogs
50-
50+
5151
build_windows_dpcpp:
5252
executor:
5353
name: win/default
@@ -67,7 +67,7 @@ jobs:
6767
when: always
6868
- store_artifacts:
6969
path: InstallLogs
70-
70+
7171
build_linux_apt_cpp:
7272
docker:
7373
- image: ubuntu:latest
@@ -79,7 +79,7 @@ jobs:
7979
- run:
8080
name: build
8181
command: scripts/build_linux.sh c++
82-
82+
8383
build_linux_apt_fortran:
8484
docker:
8585
- image: ubuntu:latest
@@ -91,7 +91,7 @@ jobs:
9191
- run:
9292
name: build
9393
command: scripts/build_linux.sh fortran
94-
94+
9595
build_linux_apt_dpcpp:
9696
docker:
9797
- image: ubuntu:latest
@@ -103,7 +103,7 @@ jobs:
103103
- run:
104104
name: build
105105
command: scripts/build_linux.sh dpc++
106-
106+
107107
build_linux_container_cpp:
108108
docker:
109109
- image: intel/oneapi-hpckit
@@ -115,7 +115,7 @@ jobs:
115115
- run:
116116
name: build
117117
command: scripts/build_linux.sh c++
118-
118+
119119
build_linux_container_fortran:
120120
docker:
121121
- image: intel/oneapi-hpckit
@@ -127,7 +127,7 @@ jobs:
127127
- run:
128128
name: build
129129
command: scripts/build_linux.sh fortran
130-
130+
131131
build_linux_container_dpcpp:
132132
docker:
133133
- image: intel/oneapi-basekit
@@ -139,7 +139,7 @@ jobs:
139139
- run:
140140
name: build
141141
command: scripts/build_linux.sh dpc++
142-
142+
143143
workflows:
144144
build-all:
145145
jobs:
@@ -152,4 +152,3 @@ workflows:
152152
- build_linux_container_cpp
153153
- build_linux_container_fortran
154154
- build_linux_container_dpcpp
155-

.github/workflows/build_all.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler
2020
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
2121
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
22-
22+
2323
jobs:
2424
build_windows_cpp:
2525
runs-on: windows-latest
@@ -42,7 +42,7 @@ jobs:
4242
bootstrapper*
4343
installer*
4444
retention-days: 7
45-
45+
4646
build_windows_fortran:
4747
runs-on: windows-latest
4848
defaults:
@@ -64,7 +64,7 @@ jobs:
6464
bootstrapper*
6565
installer*
6666
retention-days: 7
67-
67+
6868
build_windows_dpcpp:
6969
runs-on: windows-latest
7070
defaults:
@@ -86,7 +86,7 @@ jobs:
8686
bootstrapper*
8787
installer*
8888
retention-days: 7
89-
89+
9090
build_linux_apt_cpp:
9191
runs-on: ubuntu-latest
9292
defaults:
@@ -98,7 +98,7 @@ jobs:
9898
run: scripts/install_linux_apt.sh $LINUX_CPP_COMPONENTS
9999
- name: build
100100
run: scripts/build_linux.sh c++
101-
101+
102102
build_linux_apt_fortran:
103103
runs-on: ubuntu-latest
104104
defaults:
@@ -110,7 +110,7 @@ jobs:
110110
run: scripts/install_linux_apt.sh $LINUX_FORTRAN_COMPONENTS
111111
- name: build
112112
run: scripts/build_linux.sh fortran
113-
113+
114114
build_linux_apt_dpcpp:
115115
runs-on: ubuntu-latest
116116
defaults:
@@ -122,7 +122,7 @@ jobs:
122122
run: scripts/install_linux_apt.sh $LINUX_DPCPP_COMPONENTS
123123
- name: build
124124
run: scripts/build_linux.sh dpc++
125-
125+
126126
build_linux_container_cpp:
127127
runs-on: ubuntu-20.04
128128
container: intel/oneapi-hpckit
@@ -132,7 +132,7 @@ jobs:
132132
run: apt update && apt install -y git
133133
- name: build
134134
run: scripts/build_linux.sh c++
135-
135+
136136
build_linux_container_fortran:
137137
runs-on: ubuntu-20.04
138138
container: intel/oneapi-hpckit
@@ -142,7 +142,7 @@ jobs:
142142
run: apt update && apt install -y git
143143
- name: build
144144
run: scripts/build_linux.sh fortran
145-
145+
146146
build_linux_container_dpcpp:
147147
runs-on: ubuntu-20.04
148148
container: intel/oneapi-basekit
@@ -152,7 +152,7 @@ jobs:
152152
run: apt update && apt install -y git
153153
- name: build
154154
run: scripts/build_linux.sh dpc++
155-
155+
156156
build_macos_cpp:
157157
runs-on: macos-latest
158158
defaults:
@@ -173,7 +173,7 @@ jobs:
173173
bootstrapper*
174174
installer*
175175
retention-days: 7
176-
176+
177177
build_macos_fortran:
178178
runs-on: macos-latest
179179
defaults:
@@ -194,4 +194,3 @@ jobs:
194194
bootstrapper*
195195
installer*
196196
retention-days: 7
197-

.github/workflows/checks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
checks:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v2
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-python@v2
1515
- name: Install prerequisites
1616
run: |
17-
pip3 install setuptools
18-
pip3 install -r requirements.txt
17+
sudo apt-get install -qq clang-format
18+
python -m pip install --quiet --upgrade pip
19+
pip install --quiet -r requirements.txt
1920
- name: Run checks
20-
run: |
21-
~/.local/bin/reuse lint
21+
run: pre-commit run --all

.gitlab-ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
stages:
66
- build
7-
7+
88
variables:
99
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17191/w_BaseKit_b_2021.1.10.2260.exe
1010
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17163/w_HPCKit_b_2021.1.10.2266.exe
@@ -17,7 +17,7 @@ variables:
1717
LINUX_DPCPP_COMPONENTS: intel-oneapi-dpcpp-cpp-compiler
1818
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
1919
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
20-
20+
2121
.shared_windows_runners:
2222
tags:
2323
- shared-windows
@@ -37,7 +37,7 @@ build_windows_cpp:
3737
- bootstrapper*
3838
- installer*
3939
expire_in: 1 week
40-
40+
4141
build_windows_fortran:
4242
extends:
4343
- .shared_windows_runners
@@ -51,7 +51,7 @@ build_windows_fortran:
5151
- bootstrapper*
5252
- installer*
5353
expire_in: 1 week
54-
54+
5555
build_windows_dpcpp:
5656
extends:
5757
- .shared_windows_runners
@@ -65,14 +65,14 @@ build_windows_dpcpp:
6565
- bootstrapper*
6666
- installer*
6767
expire_in: 1 week
68-
68+
6969
build_linux_apt_cpp:
7070
image: ubuntu:latest
7171
stage: build
7272
script:
7373
- . scripts/install_linux_apt_no_sudo.sh $LINUX_CPP_COMPONENTS
7474
- scripts/build_linux.sh c++
75-
75+
7676
build_linux_apt_fortran:
7777
image: ubuntu:latest
7878
stage: build
@@ -86,4 +86,3 @@ build_linux_apt_dpcpp:
8686
script:
8787
- . scripts/install_linux_apt_no_sudo.sh $LINUX_DPCPP_COMPONENTS
8888
- scripts/build_linux.sh dpc++
89-

0 commit comments

Comments
 (0)