Skip to content

Commit b1d2ec2

Browse files
rbanka1rbanka1
committed
separated detect changes
1 parent ae65dbf commit b1d2ec2

8 files changed

+23
-72
lines changed

‎.github/docker/ubuntu-20.04.Dockerfile

+2-6
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ ARG HWLOC_DEPS="\
3131
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
3232
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
3333

34-
# UMF's dependencies
35-
ARG UMF_DEPS="\
36-
libtbb-dev"
37-
3834
# Dependencies for tests (optional)
3935
ARG TEST_DEPS="\
4036
libnuma-dev \
@@ -46,10 +42,10 @@ ARG MISC_DEPS="\
4642
automake \
4743
clang \
4844
g++-7 \
45+
lcov \
4946
python3-pip \
5047
sudo \
51-
whois \
52-
lcov"
48+
whois"
5349

5450
# Update and install required packages
5551
RUN apt-get update \

‎.github/docker/ubuntu-22.04.Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ ARG BASE_DEPS="\
2525

2626
# UMF's dependencies
2727
ARG UMF_DEPS="\
28-
libtbb-dev \
2928
libhwloc-dev"
3029

3130
# Dependencies for tests (optional)
3231
ARG TEST_DEPS="\
3332
libnuma-dev \
33+
libtbb-dev \
3434
valgrind"
3535

3636
# Miscellaneous for our builds/CI (optional)
3737
ARG MISC_DEPS="\
3838
automake \
3939
clang \
40+
lcov \
4041
python3-pip \
4142
sudo \
42-
whois \
43-
lcov"
43+
whois"
4444

4545
# Update and install required packages
4646
RUN apt-get update \

‎.github/docker/ubuntu-24.04.Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ ARG BASE_DEPS="\
2525

2626
# UMF's dependencies
2727
ARG UMF_DEPS="\
28-
libtbb-dev \
2928
libhwloc-dev"
3029

3130
# Dependencies for tests (optional)
3231
ARG TEST_DEPS="\
3332
libnuma-dev \
33+
libtbb-dev \
3434
valgrind"
3535

3636
# Miscellaneous for our builds/CI (optional)
3737
ARG MISC_DEPS="\
3838
automake \
3939
clang \
40+
lcov \
4041
python3-pip \
4142
sudo \
42-
whois \
43-
lcov"
43+
whois"
4444

4545
# Update and install required packages
4646
RUN apt-get update \
@@ -64,4 +64,3 @@ ENV USER test_user
6464
ENV USERPASS pass
6565
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
6666
USER test_user
67-
#

‎.github/workflows/detect_changes.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ on:
1010

1111
permissions:
1212
contents: read
13-
packages: read
1413

15-
jobs:
14+
jobs:
1615
DetectChanges:
1716
runs-on: ubuntu-latest
1817
outputs:
@@ -25,7 +24,7 @@ jobs:
2524

2625
- name: Get changed files
2726
id: changed-files
28-
uses: tj-actions/changed-files@v45.0.3
27+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v46.0.5
2928

3029
- name: List all changed files
3130
env:
@@ -35,10 +34,9 @@ jobs:
3534
3635
RunReusableDocker:
3736
needs: DetectChanges
38-
runs-on: ubuntu-latest
3937
if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
38+
uses: ./.github/workflows/reusable_dockers_build.yml
4039
permissions:
4140
contents: read
4241
packages: write
4342
secrets: inherit
44-
uses: ./.github/workflows/reusable_dockers_build.yml

‎.github/workflows/pr_push.yml

-42
Original file line numberDiff line numberDiff line change
@@ -21,60 +21,27 @@ jobs:
2121
uses: ./.github/workflows/reusable_checks.yml
2222
DocsBuild:
2323
uses: ./.github/workflows/reusable_docs_build.yml
24-
# DetectChanges:
25-
# runs-on: ubuntu-latest
26-
# outputs:
27-
# changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
28-
# steps:
29-
# - name: Checkout code
30-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31-
# with:
32-
# fetch-depth: 0
33-
34-
# - name: Get changed files
35-
# id: changed-files
36-
# uses: tj-actions/[email protected]
37-
38-
# - name: List all changed files
39-
# env:
40-
# ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
41-
# run: |
42-
# echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}"
43-
# BuildDockers:
44-
# if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
45-
# needs: [DetectChanges]
46-
# permissions:
47-
# contents: read
48-
# packages: write
49-
# secrets: inherit
50-
# uses: ./.github/workflows/reusable_dockers_build.yml
5124
FastBuild:
52-
# if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
5325
needs: [CodeChecks, DocsBuild]
5426
uses: ./.github/workflows/reusable_fast.yml
5527
Build:
5628
name: Basic builds
57-
# if: always() && (needs.FastBuild.result == 'success')
5829
needs: [FastBuild]
5930
uses: ./.github/workflows/reusable_basic.yml
6031
DevDax:
61-
# if: always() && (needs.FastBuild.result == 'success')
6232
needs: [FastBuild]
6333
uses: ./.github/workflows/reusable_dax.yml
6434
MultiNuma:
65-
# if: always() && (needs.FastBuild.result == 'success')
6635
needs: [FastBuild]
6736
uses: ./.github/workflows/reusable_multi_numa.yml
6837
L0:
69-
# if: always() && (needs.Build.result == 'success')
7038
needs: [Build]
7139
uses: ./.github/workflows/reusable_gpu.yml
7240
with:
7341
provider: "LEVEL_ZERO"
7442
runner: "L0"
7543
shared_lib: "['ON']"
7644
L0-BMG:
77-
# if: always() && (needs.Build.result == 'success')
7845
needs: [Build]
7946
uses: ./.github/workflows/reusable_gpu.yml
8047
with:
@@ -83,29 +50,24 @@ jobs:
8350
shared_lib: "['ON']"
8451
os: "['Ubuntu']"
8552
CUDA:
86-
# if: always() && (needs.Build.result == 'success')
8753
needs: [Build]
8854
uses: ./.github/workflows/reusable_gpu.yml
8955
with:
9056
provider: "CUDA"
9157
runner: "CUDA"
9258
shared_lib: "['ON']"
9359
Sanitizers:
94-
# if: always() && (needs.FastBuild.result == 'success')
9560
needs: [FastBuild]
9661
uses: ./.github/workflows/reusable_sanitizers.yml
9762
QEMU:
98-
# if: always() && (needs.FastBuild.result == 'success')
9963
needs: [FastBuild]
10064
uses: ./.github/workflows/reusable_qemu.yml
10165
with:
10266
short_run: true
10367
ProxyLib:
104-
# if: always() && (needs.Build.result == 'success')
10568
needs: [Build]
10669
uses: ./.github/workflows/reusable_proxy_lib.yml
10770
Valgrind:
108-
# if: always() && (needs.Build.result == 'success')
10971
needs: [Build]
11072
uses: ./.github/workflows/reusable_valgrind.yml
11173
Coverage:
@@ -118,26 +80,22 @@ jobs:
11880
trigger: "${{github.event_name}}"
11981
Coverage_partial:
12082
# partial coverage (on forks)
121-
# if: github.repository != 'oneapi-src/unified-memory-framework' && always() && (needs.Build.result == 'success')
12283
if: github.repository != 'oneapi-src/unified-memory-framework'
12384
needs: [Build, QEMU, ProxyLib]
12485
uses: ./.github/workflows/reusable_coverage.yml
12586
CodeQL:
126-
# if: always() && (needs.Build.result == 'success')
12787
needs: [Build]
12888
permissions:
12989
contents: read
13090
security-events: write
13191
uses: ./.github/workflows/reusable_codeql.yml
13292
Trivy:
133-
# if: always() && (needs.Build.result == 'success')
13493
needs: [Build]
13594
permissions:
13695
contents: read
13796
security-events: write
13897
uses: ./.github/workflows/reusable_trivy.yml
13998
Compatibility:
140-
# if: always() && (needs.Build.result == 'success')
14199
needs: [Build]
142100
uses: ./.github/workflows/reusable_compatibility.yml
143101
strategy:

‎.github/workflows/reusable_basic.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
name: Ubuntu
1919
runs-on: ubuntu-latest
2020
container:
21-
# image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
22-
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
21+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2322
options: --user root --privileged
2423
volumes:
2524
- ${{ github.workspace }}:${{ github.workspace }}
@@ -45,6 +44,8 @@ jobs:
4544
install_tbb: 'ON'
4645
disable_hwloc: 'OFF'
4746
link_hwloc_statically: 'OFF'
47+
# check minimum supported cmake version
48+
cmake_ver: '3.14.0'
4849
- ubuntu_ver: 22.04
4950
build_type: Release
5051
compiler: {c: gcc, cxx: g++}
@@ -54,6 +55,7 @@ jobs:
5455
install_tbb: 'ON'
5556
disable_hwloc: 'OFF'
5657
link_hwloc_statically: 'OFF'
58+
cmake_ver: '3.28.0'
5759
- ubuntu_ver: 24.04
5860
build_type: Debug
5961
compiler: {c: gcc, cxx: g++}
@@ -97,6 +99,7 @@ jobs:
9799
disable_hwloc: 'OFF'
98100
link_hwloc_statically: 'OFF'
99101
llvm_linker: '-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"'
102+
cmake_ver: 'default'
100103
# test without installing TBB
101104
- ubuntu_ver: 22.04
102105
build_type: Release
@@ -107,6 +110,7 @@ jobs:
107110
install_tbb: 'OFF'
108111
disable_hwloc: 'OFF'
109112
link_hwloc_statically: 'OFF'
113+
cmake_ver: 'default'
110114
- ubuntu_ver: 22.04
111115
build_type: Debug
112116
compiler: {c: gcc, cxx: g++}
@@ -116,6 +120,7 @@ jobs:
116120
install_tbb: 'ON'
117121
disable_hwloc: 'ON'
118122
link_hwloc_statically: 'OFF'
123+
cmake_ver: 'default'
119124
- ubuntu_ver: 22.04
120125
build_type: Release
121126
compiler: {c: gcc, cxx: g++}
@@ -125,6 +130,7 @@ jobs:
125130
install_tbb: 'ON'
126131
disable_hwloc: 'OFF'
127132
link_hwloc_statically: 'ON'
133+
cmake_ver: 'default'
128134
steps:
129135
- name: Checkout
130136
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/reusable_dockers_build.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ permissions:
1111

1212
jobs:
1313
build-dockers:
14-
# if: github.repository == 'oneapi-src/unified-memory-framework'
1514
runs-on: ubuntu-latest
1615
strategy:
1716
matrix:
1817
ubuntu-version: [20.04, 22.04, 24.04]
1918
outputs:
2019
status: ${{ job.status }}
2120
env:
22-
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }} # test
2321
IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
2422

2523
steps:
@@ -37,13 +35,10 @@ jobs:
3735
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
3836
with:
3937
registry: ghcr.io
40-
username: ${{ github.actor }} # test
41-
password: ${{ env.GHCR_TOKEN }} # test
42-
# registry: ghcr.io
43-
# username: bb-ur
44-
# password: ${{ secrets.BB_GHCR_TOKEN }}
38+
username: bb-ur
39+
password: ${{ secrets.BB_GHCR_TOKEN }}
4540

4641
- name: Push ubuntu-${{ matrix.ubuntu-version }} Docker image
47-
# if: github.event_name != 'pull_request'
42+
if: github.event_name != 'pull_request'
4843
run: |
4944
docker push ${{ env.IMG }}

‎.github/workflows/reusable_fast.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ 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-
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
19+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2120
options: --user root --privileged
2221
volumes:
2322
- ${{ github.workspace }}:${{ github.workspace }}

0 commit comments

Comments
 (0)