Skip to content

Commit ae5ad2e

Browse files
Merge pull request #708 from ldorau/Run_setvars.sh_also_before_building_for_icpx_compiler
Run setvars.sh also before building for icpx compiler
2 parents 74b6724 + 0b6d1b7 commit ae5ad2e

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/basic.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,14 @@ jobs:
158158
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
159159
160160
- name: Build UMF
161-
run: cmake --build ${{env.BUILD_DIR}} -j $(nproc)
161+
run: |
162+
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
163+
cmake --build ${{env.BUILD_DIR}} -j $(nproc)
162164
163165
- name: Run tests
164166
working-directory: ${{env.BUILD_DIR}}
165-
run: >
166-
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh &&' || ''}}
167+
run: |
168+
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
167169
ctest --output-on-failure --test-dir test
168170
169171
- name: Remove the installation directory

.github/workflows/sanitizers.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ jobs:
6666
-DUMF_TESTS_FAIL_ON_SKIP=ON
6767
6868
- name: Build UMF
69-
run: cmake --build ${{env.BUILD_DIR}} -j $(nproc)
69+
run: |
70+
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
71+
cmake --build ${{env.BUILD_DIR}} -j $(nproc)
7072
7173
- name: Run tests
7274
working-directory: ${{env.BUILD_DIR}}
73-
run: >
74-
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh &&' || ''}}
75+
run: |
76+
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
7577
ctest --output-on-failure
7678
7779
windows-build:

0 commit comments

Comments
 (0)