Skip to content

Commit 0583049

Browse files
bratpiorkabratpiorka
committed
test
1 parent a92aa12 commit 0583049

File tree

3 files changed

+35
-107
lines changed

3 files changed

+35
-107
lines changed

‎.github/docker/ubuntu-22.04.Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2024 Intel Corporation
1+
# Copyright (C) 2024-2025 Intel Corporation
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

@@ -37,7 +37,11 @@ ARG MISC_DEPS="\
3737
clang \
3838
python3-pip \
3939
sudo \
40-
whois"
40+
whois \
41+
wget \
42+
libenchant-2-dev \
43+
jq \
44+
doxygen"
4145

4246
# Update and install required packages
4347
RUN apt-get update \
@@ -55,6 +59,7 @@ RUN mkdir --mode 777 /opt/umf/
5559
# Additional dependencies (installed via pip)
5660
COPY third_party/requirements.txt /opt/umf/requirements.txt
5761
RUN pip3 install --no-cache-dir -r /opt/umf/requirements.txt
62+
RUN pip3 install bandit codespell
5863

5964
# Add a new (non-root) 'test_user'
6065
ENV USER test_user

‎.github/workflows/pr_push.yml

-85
Original file line numberDiff line numberDiff line change
@@ -18,88 +18,3 @@ permissions:
1818
jobs:
1919
CodeChecks:
2020
uses: ./.github/workflows/reusable_checks.yml
21-
DocsBuild:
22-
uses: ./.github/workflows/reusable_docs_build.yml
23-
FastBuild:
24-
name: Fast builds
25-
needs: [CodeChecks, DocsBuild]
26-
uses: ./.github/workflows/reusable_fast.yml
27-
Build:
28-
name: Basic builds
29-
needs: [FastBuild]
30-
uses: ./.github/workflows/reusable_basic.yml
31-
DevDax:
32-
needs: [FastBuild]
33-
uses: ./.github/workflows/reusable_dax.yml
34-
MultiNuma:
35-
needs: [FastBuild]
36-
uses: ./.github/workflows/reusable_multi_numa.yml
37-
L0:
38-
needs: [Build]
39-
uses: ./.github/workflows/reusable_gpu.yml
40-
with:
41-
provider: "LEVEL_ZERO"
42-
runner: "L0"
43-
shared_lib: "['ON']"
44-
L0-BMG:
45-
needs: [Build]
46-
uses: ./.github/workflows/reusable_gpu.yml
47-
with:
48-
provider: "LEVEL_ZERO"
49-
runner: "L0-BMG"
50-
shared_lib: "['ON']"
51-
os: "['Ubuntu']"
52-
CUDA:
53-
needs: [Build]
54-
uses: ./.github/workflows/reusable_gpu.yml
55-
with:
56-
provider: "CUDA"
57-
runner: "CUDA"
58-
shared_lib: "['ON']"
59-
Sanitizers:
60-
needs: [FastBuild]
61-
uses: ./.github/workflows/reusable_sanitizers.yml
62-
QEMU:
63-
needs: [FastBuild]
64-
uses: ./.github/workflows/reusable_qemu.yml
65-
with:
66-
short_run: true
67-
ProxyLib:
68-
needs: [Build]
69-
uses: ./.github/workflows/reusable_proxy_lib.yml
70-
Valgrind:
71-
needs: [Build]
72-
uses: ./.github/workflows/reusable_valgrind.yml
73-
Coverage:
74-
# total coverage (on upstream only)
75-
if: github.repository == 'oneapi-src/unified-memory-framework'
76-
needs: [Build, DevDax, L0, CUDA, MultiNuma, QEMU, ProxyLib]
77-
uses: ./.github/workflows/reusable_coverage.yml
78-
secrets: inherit
79-
with:
80-
trigger: "${{github.event_name}}"
81-
Coverage_partial:
82-
# partial coverage (on forks)
83-
if: github.repository != 'oneapi-src/unified-memory-framework'
84-
needs: [Build, QEMU, ProxyLib]
85-
uses: ./.github/workflows/reusable_coverage.yml
86-
CodeQL:
87-
needs: [Build]
88-
permissions:
89-
contents: read
90-
security-events: write
91-
uses: ./.github/workflows/reusable_codeql.yml
92-
Trivy:
93-
needs: [Build]
94-
permissions:
95-
contents: read
96-
security-events: write
97-
uses: ./.github/workflows/reusable_trivy.yml
98-
Compatibility:
99-
needs: [Build]
100-
uses: ./.github/workflows/reusable_compatibility.yml
101-
strategy:
102-
matrix:
103-
tag: ["v0.11.0-rc1"]
104-
with:
105-
tag: ${{matrix.tag}}

‎.github/workflows/reusable_checks.yml

+28-20
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,57 @@ permissions:
1010
jobs:
1111
CodeChecks:
1212
name: Basic code checks
13-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
13+
runs-on: 'DSS-L0-FLEX'
14+
#container: ubuntu:22.04
15+
container:
16+
image: localhost:5000/umf_docker:latest
17+
# root is needed? at least for the checkout step
18+
# https://github.com/actions/checkout/issues/1575
19+
options: --user root
1420

1521
steps:
1622
- name: Checkout repository
1723
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1824
with:
1925
fetch-depth: 0
2026

21-
- name: Install dependencies
22-
run: |
23-
sudo apt-get update
24-
sudo apt-get install -y black cmake clang-format-15 cmake-format libhwloc-dev doxygen
27+
#- name: Install dependencies
28+
# run: |
29+
# # python3 -m pip install -r third_party/requirements.txt
30+
# python3 -m pip install bandit codespell
2531

26-
# Latest distros do not allow global pip installation
27-
- name: Install Python requirements in venv
28-
run: |
29-
python3 -m venv .venv
30-
. .venv/bin/activate
31-
echo "$PATH" >> $GITHUB_PATH
32-
python3 -m pip install -r third_party/requirements.txt
33-
python3 -m pip install bandit codespell
32+
#- name: Install dependencies
33+
# run: |
34+
# DEBIAN_FRONTEND=noninteractive apt-get install -y git python3-pip black cmake clang-format-15 cmake-format libhwloc-dev doxygen libtbb-dev
35+
# # TODO: needed by actions - move to dockerfile
36+
# DEBIAN_FRONTEND=noninteractive apt-get install -y wget libenchant-2-dev jq
37+
# python3 -m pip install -r third_party/requirements.txt
38+
# python3 -m pip install bandit codespell
3439

35-
- name: Configure CMake
40+
- name: Configure CMake
3641
run: >
3742
cmake
38-
-B ${{github.workspace}}/build
43+
-B build
3944
-DUMF_FORMAT_CODE_STYLE=ON
4045
-DUMF_BUILD_TESTS=OFF
4146
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
4247
-DUMF_BUILD_CUDA_PROVIDER=OFF
4348
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
4449
4550
- name: Check C/C++ formatting
46-
run: cmake --build build --target clang-format-check
51+
run: |
52+
cmake --build build --target clang-format-check
53+
git diff --exit-code
4754
4855
- name: Check CMake formatting
4956
run: |
5057
cmake --build build --target cmake-format-apply
5158
git diff --exit-code
5259
5360
- name: Check Python formatting
54-
run: cmake --build build --target black-format-check
61+
run: |
62+
cmake --build build --target black-format-check
63+
git diff --exit-code
5564
5665
- name: Run check-license
5766
run: |
@@ -67,10 +76,9 @@ jobs:
6776

6877
- name: Check spelling in docs
6978
run: |
70-
cmake -B build
7179
cmake --build build --target docs
7280
sphinx-build -b spelling ./build/docs_build/config ./build/docs_build/spelling_log -W
7381
74-
# Run Bandit recursively, but omit _deps directory (with 3rd party code) and python's venv
82+
# Run Bandit recursively, but omit _deps directory (with 3rd party code)
7583
- name: Run Bandit
76-
run: python3 -m bandit -r . -x '/_deps/,/.venv/'
84+
run: python3 -m bandit -r . -x '/_deps/'

0 commit comments

Comments
 (0)