Skip to content

Commit 3552ecc

Browse files
rbanka1rbanka1
committed
corrections
1 parent ae65dbf commit 3552ecc

File tree

9 files changed

+94
-110
lines changed

9 files changed

+94
-110
lines changed

‎.github/docker/ubuntu-20.04.Dockerfile‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,8 @@ ARG BASE_DEPS="\
2424

2525
# Hwloc installation dependencies
2626
ARG HWLOC_DEPS="\
27-
dos2unix \
2827
libtool"
2928

30-
# Copy hwloc
31-
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
32-
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
33-
34-
# UMF's dependencies
35-
ARG UMF_DEPS="\
36-
libtbb-dev"
37-
3829
# Dependencies for tests (optional)
3930
ARG TEST_DEPS="\
4031
libnuma-dev \
@@ -46,10 +37,13 @@ ARG MISC_DEPS="\
4637
automake \
4738
clang \
4839
g++-7 \
40+
lcov \
4941
python3-pip \
5042
sudo \
51-
whois \
52-
lcov"
43+
whois"
44+
45+
# libhwloc-dev is required - installed via script because hwloc version is too old on this OS
46+
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
5347

5448
# Update and install required packages
5549
RUN apt-get update \
@@ -73,5 +67,5 @@ COPY third_party/requirements.txt /opt/umf/requirements.txt
7367
# Add a new (non-root) 'test_user'
7468
ENV USER test_user
7569
ENV USERPASS pass
76-
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
70+
RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
7771
USER test_user

‎.github/docker/ubuntu-22.04.Dockerfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,34 @@ ENV NOTTY 1
1717
ENV DEBIAN_FRONTEND noninteractive
1818

1919
# Base development packages
20+
# It seems that libtool is not directly needed
21+
# but it is still required when Building UMF
2022
ARG BASE_DEPS="\
2123
build-essential \
2224
cmake \
2325
git \
24-
libtool"
26+
gnupg \
27+
libtool \
28+
wget"
2529

2630
# UMF's dependencies
2731
ARG UMF_DEPS="\
28-
libtbb-dev \
2932
libhwloc-dev"
3033

3134
# Dependencies for tests (optional)
3235
ARG TEST_DEPS="\
3336
libnuma-dev \
37+
libtbb-dev \
3438
valgrind"
3539

3640
# Miscellaneous for our builds/CI (optional)
3741
ARG MISC_DEPS="\
3842
automake \
3943
clang \
44+
lcov \
4045
python3-pip \
4146
sudo \
42-
whois \
43-
lcov"
47+
whois"
4448

4549
# Update and install required packages
4650
RUN apt-get update \
@@ -62,5 +66,5 @@ RUN pip3 install --no-cache-dir -r /opt/umf/requirements.txt
6266
# Add a new (non-root) 'test_user'
6367
ENV USER test_user
6468
ENV USERPASS pass
65-
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
69+
RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
6670
USER test_user

‎.github/docker/ubuntu-24.04.Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,27 @@ ARG BASE_DEPS="\
2121
build-essential \
2222
cmake \
2323
git \
24-
gnupg"
24+
gnupg \
25+
wget"
2526

2627
# UMF's dependencies
2728
ARG UMF_DEPS="\
28-
libtbb-dev \
2929
libhwloc-dev"
3030

3131
# Dependencies for tests (optional)
3232
ARG TEST_DEPS="\
3333
libnuma-dev \
34+
libtbb-dev \
3435
valgrind"
3536

3637
# Miscellaneous for our builds/CI (optional)
3738
ARG MISC_DEPS="\
3839
automake \
3940
clang \
41+
lcov \
4042
python3-pip \
4143
sudo \
42-
whois \
43-
lcov"
44+
whois"
4445

4546
# Update and install required packages
4647
RUN apt-get update \
@@ -64,4 +65,3 @@ ENV USER test_user
6465
ENV USERPASS pass
6566
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
6667
USER test_user
67-
#

‎.github/workflows/detect_changes.yml‎

Lines changed: 3 additions & 5 deletions
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‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,62 +19,27 @@ permissions:
1919
jobs:
2020
CodeChecks:
2121
uses: ./.github/workflows/reusable_checks.yml
22-
DocsBuild:
23-
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
5122
FastBuild:
52-
# if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
53-
needs: [CodeChecks, DocsBuild]
23+
# needs: [CodeChecks]
5424
uses: ./.github/workflows/reusable_fast.yml
5525
Build:
5626
name: Basic builds
57-
# if: always() && (needs.FastBuild.result == 'success')
58-
needs: [FastBuild]
27+
# needs: [FastBuild]
5928
uses: ./.github/workflows/reusable_basic.yml
6029
DevDax:
61-
# if: always() && (needs.FastBuild.result == 'success')
6230
needs: [FastBuild]
6331
uses: ./.github/workflows/reusable_dax.yml
6432
MultiNuma:
65-
# if: always() && (needs.FastBuild.result == 'success')
6633
needs: [FastBuild]
6734
uses: ./.github/workflows/reusable_multi_numa.yml
6835
L0:
69-
# if: always() && (needs.Build.result == 'success')
7036
needs: [Build]
7137
uses: ./.github/workflows/reusable_gpu.yml
7238
with:
7339
provider: "LEVEL_ZERO"
7440
runner: "L0"
7541
shared_lib: "['ON']"
7642
L0-BMG:
77-
# if: always() && (needs.Build.result == 'success')
7843
needs: [Build]
7944
uses: ./.github/workflows/reusable_gpu.yml
8045
with:
@@ -83,29 +48,24 @@ jobs:
8348
shared_lib: "['ON']"
8449
os: "['Ubuntu']"
8550
CUDA:
86-
# if: always() && (needs.Build.result == 'success')
8751
needs: [Build]
8852
uses: ./.github/workflows/reusable_gpu.yml
8953
with:
9054
provider: "CUDA"
9155
runner: "CUDA"
9256
shared_lib: "['ON']"
9357
Sanitizers:
94-
# if: always() && (needs.FastBuild.result == 'success')
9558
needs: [FastBuild]
9659
uses: ./.github/workflows/reusable_sanitizers.yml
9760
QEMU:
98-
# if: always() && (needs.FastBuild.result == 'success')
9961
needs: [FastBuild]
10062
uses: ./.github/workflows/reusable_qemu.yml
10163
with:
10264
short_run: true
10365
ProxyLib:
104-
# if: always() && (needs.Build.result == 'success')
10566
needs: [Build]
10667
uses: ./.github/workflows/reusable_proxy_lib.yml
10768
Valgrind:
108-
# if: always() && (needs.Build.result == 'success')
10969
needs: [Build]
11070
uses: ./.github/workflows/reusable_valgrind.yml
11171
Coverage:
@@ -118,26 +78,22 @@ jobs:
11878
trigger: "${{github.event_name}}"
11979
Coverage_partial:
12080
# partial coverage (on forks)
121-
# if: github.repository != 'oneapi-src/unified-memory-framework' && always() && (needs.Build.result == 'success')
12281
if: github.repository != 'oneapi-src/unified-memory-framework'
12382
needs: [Build, QEMU, ProxyLib]
12483
uses: ./.github/workflows/reusable_coverage.yml
12584
CodeQL:
126-
# if: always() && (needs.Build.result == 'success')
12785
needs: [Build]
12886
permissions:
12987
contents: read
13088
security-events: write
13189
uses: ./.github/workflows/reusable_codeql.yml
13290
Trivy:
133-
# if: always() && (needs.Build.result == 'success')
13491
needs: [Build]
13592
permissions:
13693
contents: read
13794
security-events: write
13895
uses: ./.github/workflows/reusable_trivy.yml
13996
Compatibility:
140-
# if: always() && (needs.Build.result == 'success')
14197
needs: [Build]
14298
uses: ./.github/workflows/reusable_compatibility.yml
14399
strategy:

0 commit comments

Comments
 (0)