Skip to content

Commit d065388

Browse files
rbanka1rbanka1
committed
.
1 parent dc10336 commit d065388

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

‎.github/workflows/pr_push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
CodeChecks:
2121
uses: ./.github/workflows/reusable_checks.yml
2222
FastBuild:
23-
needs: [CodeChecks]
23+
# needs: [CodeChecks]
2424
uses: ./.github/workflows/reusable_fast.yml
2525
Build:
2626
name: Basic builds
27-
needs: [FastBuild]
27+
# needs: [FastBuild]
2828
uses: ./.github/workflows/reusable_basic.yml
2929
DevDax:
3030
needs: [FastBuild]

‎.github/workflows/reusable_basic.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ jobs:
1818
name: Ubuntu
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
22-
options: --user root --privileged
21+
# image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
22+
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
23+
options: --user root
2324
volumes:
2425
- ${{ github.workspace }}:${{ github.workspace }}
2526
strategy:
2627
matrix:
27-
ubuntu_ver: ['22.04', '24.04']
28+
ubuntu_ver: ['ubuntu-22.04', 'ubuntu-24.04']
2829
build_type: [Debug, Release]
2930
compiler: [{c: gcc, cxx: g++}]
3031
shared_library: ['OFF']
@@ -35,7 +36,7 @@ jobs:
3536
link_hwloc_statically: ['OFF']
3637
cmake_ver: ['default']
3738
include:
38-
- ubuntu_ver: 22.04
39+
- ubuntu_ver: ubuntu-22.04
3940
build_type: Release
4041
compiler: {c: clang, cxx: clang++}
4142
shared_library: 'OFF'
@@ -46,7 +47,7 @@ jobs:
4647
link_hwloc_statically: 'OFF'
4748
# check minimum supported cmake version
4849
cmake_ver: '3.14.0'
49-
- ubuntu_ver: 22.04
50+
- ubuntu_ver: ubuntu-22.04
5051
build_type: Release
5152
compiler: {c: gcc, cxx: g++}
5253
shared_library: 'ON'
@@ -56,7 +57,7 @@ jobs:
5657
disable_hwloc: 'OFF'
5758
link_hwloc_statically: 'OFF'
5859
cmake_ver: '3.28.0'
59-
- ubuntu_ver: 24.04
60+
- ubuntu_ver: ubuntu-24.04
6061
build_type: Debug
6162
compiler: {c: gcc, cxx: g++}
6263
shared_library: 'ON'
@@ -67,7 +68,7 @@ jobs:
6768
link_hwloc_statically: 'OFF'
6869
cmake_ver: 'default'
6970
# test level_zero_provider='OFF' and cuda_provider='OFF'
70-
- ubuntu_ver: 22.04
71+
- ubuntu_ver: ubuntu-22.04
7172
build_type: Release
7273
compiler: {c: gcc, cxx: g++}
7374
shared_library: 'OFF'
@@ -78,7 +79,7 @@ jobs:
7879
link_hwloc_statically: 'OFF'
7980
cmake_ver: 'default'
8081
# test icx compiler
81-
- ubuntu_ver: 22.04
82+
- ubuntu_ver: ubuntu-22.04
8283
build_type: Release
8384
compiler: {c: icx, cxx: icpx}
8485
shared_library: 'ON'
@@ -89,7 +90,7 @@ jobs:
8990
link_hwloc_statically: 'OFF'
9091
cmake_ver: 'default'
9192
# test lld linker
92-
- ubuntu_ver: 24.04
93+
- ubuntu_ver: ubuntu-24.04
9394
build_type: Release
9495
compiler: {c: icx, cxx: icpx}
9596
shared_library: 'ON'
@@ -101,7 +102,7 @@ jobs:
101102
llvm_linker: '-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"'
102103
cmake_ver: 'default'
103104
# test without installing TBB
104-
- ubuntu_ver: 22.04
105+
- ubuntu_ver: ubuntu-22.04
105106
build_type: Release
106107
compiler: {c: gcc, cxx: g++}
107108
shared_library: 'ON'
@@ -111,7 +112,7 @@ jobs:
111112
disable_hwloc: 'OFF'
112113
link_hwloc_statically: 'OFF'
113114
cmake_ver: 'default'
114-
- ubuntu_ver: 22.04
115+
- ubuntu_ver: ubuntu-22.04
115116
build_type: Debug
116117
compiler: {c: gcc, cxx: g++}
117118
shared_library: 'ON'
@@ -121,7 +122,7 @@ jobs:
121122
disable_hwloc: 'ON'
122123
link_hwloc_statically: 'OFF'
123124
cmake_ver: 'default'
124-
- ubuntu_ver: 22.04
125+
- ubuntu_ver: ubuntu-22.04
125126
build_type: Release
126127
compiler: {c: gcc, cxx: g++}
127128
shared_library: 'ON'
@@ -202,7 +203,7 @@ jobs:
202203
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
203204
working-directory: ${{env.BUILD_DIR}}
204205
run: |
205-
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-ubuntu-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
206+
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
206207
echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
207208
../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
208209
mkdir -p ${{env.COVERAGE_DIR}}

‎.github/workflows/reusable_dockers_build.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
matrix:
1717
ubuntu-version: [20.04, 22.04, 24.04]
1818
env:
19-
IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
19+
# IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
20+
IMG: ghcr.io/${{ github.actor }}/umf-ubuntu-${{ matrix.ubuntu-version }}:latest # test
2021

2122
steps:
2223
- name: Checkout repository
@@ -33,10 +34,12 @@ jobs:
3334
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
3435
with:
3536
registry: ghcr.io
36-
username: bb-ur
37-
password: ${{ secrets.BB_GHCR_TOKEN }}
37+
username: ${{ github.actor }} # test
38+
password: ${{ secrets.GHCR_TOKEN }} # test
39+
# username: bb-ur
40+
# password: ${{ secrets.BB_GHCR_TOKEN }}
3841

3942
- name: Push ubuntu-${{ matrix.ubuntu-version }} Docker image
40-
if: github.event_name != 'pull_request'
43+
# if: github.event_name != 'pull_request'
4144
run: |
4245
docker push ${{ env.IMG }}

‎.github/workflows/reusable_fast.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
name: Linux
1717
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
1818
container:
19-
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
20-
options: --user root --privileged
19+
# image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
20+
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
21+
options: --user root
2122
volumes:
2223
- ${{ github.workspace }}:${{ github.workspace }}
2324
strategy:

0 commit comments

Comments
 (0)