Skip to content

Commit c26684e

Browse files
committed
corrections V3
1 parent c854942 commit c26684e

File tree

6 files changed

+25
-51
lines changed

6 files changed

+25
-51
lines changed

.github/docker/ubuntu-20.04.Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25-
# UMF's dependencies
26-
ARG UMF_DEPS="\
27-
libhwloc-dev \
28-
libtbb-dev"
29-
3025
# Dependencies for tests (optional)
3126
ARG TEST_DEPS="\
3227
libnuma-dev \

.github/docker/ubuntu-22.04.Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25-
# UMF's dependencies
26-
ARG UMF_DEPS="\
27-
libhwloc-dev \
28-
libtbb-dev"
29-
3025
# Dependencies for tests (optional)
3126
ARG TEST_DEPS="\
3227
libnuma-dev \

.github/docker/ubuntu-24.04.Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ ARG BASE_DEPS="\
2222
cmake \
2323
git"
2424

25-
# UMF's dependencies
26-
ARG UMF_DEPS="\
27-
libhwloc-dev \
28-
libtbb-dev"
29-
3025
# Dependencies for tests (optional)
3126
ARG TEST_DEPS="\
3227
libnuma-dev \
@@ -75,4 +70,4 @@ RUN pip3 install --no-cache-dir --break-system-packages -r /opt/umf/requirements
7570
ENV USER test_user
7671
ENV USERPASS pass
7772
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"
78-
USER test_user
73+
USER test_user

.github/workflows/pr_push.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,42 +23,31 @@ jobs:
2323
uses: ./.github/workflows/reusable_docs_build.yml
2424
DetectChanges:
2525
runs-on: ubuntu-latest
26-
outputs:
27-
changed_files: ${{ steps.get-changes.outputs.all_changed_files }}
26+
outputs:
27+
changed_files: ${{ steps.changed-files.outputs.all_changed_files }}
2828
steps:
2929
- name: Checkout code
3030
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3131
with:
32-
fetch-depth: 2
32+
fetch-depth: 0
3333

34-
- name: List all changed files
35-
id: get-changes
36-
run: |
37-
git diff --name-only HEAD^ HEAD > all_changed_files.txt
38-
changed_files=$(cat all_changed_files.txt | tr '\n' ' ')
39-
echo "changed_files=$changed_files" >> $GITHUB_ENV
40-
echo "::set-output name=all_changed_files::$changed_files"
34+
- name: Get changed files
35+
id: changed-files
36+
uses: tj-actions/[email protected]
4137

42-
- name: all changed files
43-
run: |
44-
echo "changed files: ${{ needs.DetectChanges.outputs.changed_files }}"
45-
Check:
46-
runs-on: ubuntu-latest
47-
needs: [DetectChanges]
48-
steps:
49-
- name: check changed files
38+
- name: List all changed files
39+
env:
40+
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
5041
run: |
51-
echo "all_changed_files: ${{ needs.DetectChanges.outputs.changed_files }}"
52-
echo "all_changed_files: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}"
53-
42+
echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}"
5443
BuildDockers:
5544
if: ${{ contains(join(needs.DetectChanges.outputs.changed_files, ' '), '.github/docker/') }}
5645
needs: [DetectChanges]
5746
permissions:
5847
contents: read
5948
packages: write
6049
secrets: inherit
61-
uses: ./.github/workflows/build_dockers.yml
50+
uses: ./.github/workflows/reusable_dockers_build.yml
6251
FastBuild:
6352
if: always() && (needs.BuildDockers.result == 'skipped' || needs.BuildDockers.result == 'success')
6453
needs: [ CodeChecks, DocsBuild, BuildDockers]

.github/workflows/build_dockers.yml renamed to .github/workflows/reusable_dockers_build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
outputs:
1919
status: ${{ job.status }}
2020
env:
21-
GHCR_TOKEN: ${{ secrets.BB_GHCR_TOKEN }} # ${{ secrets.GHCR_TOKEN }}
22-
IMG: ghcr.io/${{ github.bb-ur }}/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
21+
IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
2322

2423
steps:
2524
- name: Checkout repository
@@ -31,10 +30,10 @@ jobs:
3130
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
3231
with:
3332
registry: ghcr.io
34-
username: ${{ github.bb-ur }} # ${{ github.actor }}
35-
password: ${{ env.BB_GHCR_TOKEN }} # ${{ env.GHCR_TOKEN }}
33+
username: bb-ur
34+
password: ${{ secrets.BB_GHCR_TOKEN }}
3635

3736
- name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
3837
run: |
3938
docker build -f .github/docker/ubuntu-${{ matrix.ubuntu-version }}.Dockerfile -t ${{ env.IMG }} .
40-
docker push ${{ env.IMG }}
39+
docker push ${{ env.IMG }}

.github/workflows/reusable_fast.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ jobs:
1616
name: Linux
1717
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
1818
container:
19-
image: ${{ matrix.image }}
19+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2020
options: --user root --privileged
2121
volumes:
2222
- ${{ github.workspace }}:${{ github.workspace }}
2323
strategy:
2424
matrix:
2525
include:
26-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
26+
- ubuntu_ver: 22.04
2727
build_tests: 'ON'
2828
extra_build_options: ' -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
2929
simple_cmake: 'OFF'
3030
# pure C build
31-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
31+
- ubuntu_ver: 22.04
3232
build_tests: 'OFF'
3333
extra_build_options: '-DUMF_BUILD_BENCHMARKS=ON'
3434
simple_cmake: 'OFF'
3535
# simplest CMake on ubuntu-latest
36-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
36+
- ubuntu_ver: 24.04
3737
build_tests: 'ON'
3838
simple_cmake: 'ON'
39-
- image: ghcr.io/rbanka1/umf-ubuntu-20.04:latest
39+
- ubuntu_ver: 20.04
4040
build_tests: 'ON'
4141
simple_cmake: 'ON'
4242

@@ -97,8 +97,8 @@ jobs:
9797
simple_cmake: 'OFF'
9898
- build_tests: 'OFF'
9999
simple_cmake: 'OFF'
100-
# - build_tests: 'OFF'
101-
# simple_cmake: 'ON'
100+
- build_tests: 'OFF'
101+
simple_cmake: 'ON'
102102

103103
steps:
104104
- name: Checkout repository
@@ -140,6 +140,7 @@ jobs:
140140
cmake
141141
-B ${{env.BUILD_DIR}}
142142
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
143+
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
143144
-DUMF_BUILD_SHARED_LIBRARY=ON
144145
-DUMF_TESTS_FAIL_ON_SKIP=ON
145146
@@ -161,4 +162,4 @@ jobs:
161162
- name: Print metadata of our dll's
162163
run: |
163164
get-command ${{github.workspace}}/build/bin/Release/umf.dll | format-list
164-
get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list
165+
get-command ${{github.workspace}}/build/src/proxy_lib/Release/umf_proxy.dll | format-list

0 commit comments

Comments
 (0)