Skip to content

Commit 7796db1

Browse files
JakeOShannessyJake
authored and
Jake
committed
Add other executables
Previously, executables other than smokeview were not built using scripts and makefiles. This commit now builds all executables except hashfort.
1 parent a57b28b commit 7796db1

File tree

3 files changed

+164
-177
lines changed

3 files changed

+164
-177
lines changed

.github/workflows/cmake.yml

+28-17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: CMake Build
22
on: [push, pull_request]
33
env:
4-
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18418/w_BaseKit_p_2022.1.0.116_offline.exe
5-
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
6-
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18445/l_BaseKit_p_2022.1.1.119_offline.sh
7-
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18438/l_HPCKit_p_2022.1.1.97_offline.sh
4+
WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18599/w_BaseKit_p_2022.1.3.210_offline.exe
5+
WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe
6+
LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18487/l_BaseKit_p_2022.1.2.146_offline.sh
7+
LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18479/l_HPCKit_p_2022.1.2.117_offline.sh
88
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18341/m_HPCKit_p_2022.1.0.86_offline.dmg
99
WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-compiler
1010
WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
@@ -16,6 +16,9 @@ env:
1616
LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
1717
LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
1818
MACOS_CPP_COMPONENTS: intel.oneapi.mac.cpp-compiler
19+
MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
20+
CACHE_NUMBER: 2
21+
COMPILER_VERSION: 2022.0.3
1922
BUILD_TYPE: Release
2023

2124
jobs:
@@ -167,15 +170,23 @@ jobs:
167170
steps:
168171
- name: Checkout code
169172
uses: actions/checkout@v2
170-
# - name: cache install cpp
171-
# id: cache-install-cpp
172-
# uses: actions/cache@v2
173-
# with:
174-
# path: C:\Program Files (x86)\Intel\oneAPI
175-
# key: install3-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_CPP_COMPONENTS }}-compiler-${{ hashFiles('**/.github/workflows/cache_exclude_windows.sh') }}
176-
- name: install cpp
177-
# if: steps.cache-install-cpp.outputs.cache-hit != 'true'
178-
run: .github/workflows/install_windows_oneapi.bat $WINDOWS_HPCKIT_URL
173+
- name: cache install
174+
id: cache-install
175+
uses: actions/cache@v2
176+
with:
177+
path: |
178+
C:\Program Files (x86)\Intel\oneAPI\setvars.bat
179+
C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
180+
C:\Program Files (x86)\Intel\oneAPI\compiler
181+
key: install-${{ env.CACHE_NUMBER }}-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_CPP_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
182+
- name: install
183+
if: steps.cache-install.outputs.cache-hit != 'true'
184+
run: .github/workflows/install_windows_oneapi.bat $WINDOWS_HPCKIT_URL $WINDOWS_CPP_COMPONENTS
185+
- name: Make latest link
186+
shell: cmd
187+
run: |
188+
rmdir "C:\Program Files (x86)\Intel\oneAPI\compiler\latest"
189+
mklink /D "C:\Program Files (x86)\Intel\oneAPI\compiler\latest" "C:\Program Files (x86)\Intel\oneAPI\compiler\2022.0.3"
179190
- name: build smokeview lua
180191
shell: cmd
181192
run: |
@@ -197,10 +208,10 @@ jobs:
197208
- name: Set exec suffix
198209
if: ${{ matrix.lua }} == lua
199210
run: echo "exec_suffix=-lua" >> $GITHUB_ENV
200-
# - name: exclude unused files from cache
201-
# if: steps.cache-install.outputs.cache-hit != 'true'
202-
# shell: bash
203-
# run: .github/workflows/cache_exclude_windows.sh
211+
- name: exclude unused files from cache
212+
if: steps.cache-install.outputs.cache-hit != 'true'
213+
shell: bash
214+
run: .github/workflows/cache_exclude_windows.sh
204215
- name: Archive production artifacts
205216
uses: actions/upload-artifact@v2
206217
with:

0 commit comments

Comments
 (0)