Skip to content

Commit e6900b6

Browse files
rbanka1rbanka1
committed
.
1 parent b1d2ec2 commit e6900b6

File tree

7 files changed

+49
-35
lines changed

7 files changed

+49
-35
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ 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-
3429
# Dependencies for tests (optional)
3530
ARG TEST_DEPS="\
3631
libnuma-dev \
37-
libtbb-dev \
32+
# libtbb-dev \
3833
valgrind"
3934

4035
# Miscellaneous for our builds/CI (optional)
@@ -47,6 +42,9 @@ ARG MISC_DEPS="\
4742
sudo \
4843
whois"
4944

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
47+
5048
# Update and install required packages
5149
RUN apt-get update \
5250
&& apt-get install -y --no-install-recommends \

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
2020
ARG BASE_DEPS="\
2121
build-essential \
2222
cmake \
23-
git \
24-
libtool"
23+
git "
2524

2625
# UMF's dependencies
2726
ARG UMF_DEPS="\
@@ -30,7 +29,7 @@ ARG UMF_DEPS="\
3029
# Dependencies for tests (optional)
3130
ARG TEST_DEPS="\
3231
libnuma-dev \
33-
libtbb-dev \
32+
# libtbb-dev \
3433
valgrind"
3534

3635
# Miscellaneous for our builds/CI (optional)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG UMF_DEPS="\
3030
# Dependencies for tests (optional)
3131
ARG TEST_DEPS="\
3232
libnuma-dev \
33-
libtbb-dev \
33+
# libtbb-dev \
3434
valgrind"
3535

3636
# Miscellaneous for our builds/CI (optional)

‎.github/workflows/pr_push.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ permissions:
1919
jobs:
2020
CodeChecks:
2121
uses: ./.github/workflows/reusable_checks.yml
22-
DocsBuild:
23-
uses: ./.github/workflows/reusable_docs_build.yml
2422
FastBuild:
25-
needs: [CodeChecks, DocsBuild]
23+
needs: [CodeChecks]
2624
uses: ./.github/workflows/reusable_fast.yml
2725
Build:
2826
name: Basic builds

‎.github/workflows/reusable_basic.yml‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ 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 --privileged
2324
volumes:
2425
- ${{ github.workspace }}:${{ github.workspace }}
2526
strategy:
@@ -137,15 +138,33 @@ jobs:
137138
with:
138139
fetch-depth: 0
139140

141+
- name: Install cmake (non-default version)
142+
if: matrix.cmake_ver != 'default'
143+
run: |
144+
echo ${USERPASS} | sudo -Sk apt-get remove --purge -y cmake
145+
wget https://github.com/Kitware/CMake/releases/download/v${{matrix.cmake_ver}}/cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
146+
chmod +x cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
147+
echo ${USERPASS} | sudo -Sk ./cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh --skip-license --prefix=/usr/local
148+
149+
- name: Install TBB apt package
150+
if: matrix.install_tbb == 'ON'
151+
run: |
152+
echo ${USERPASS} | sudo -Sk apt-get install -y libtbb-dev
153+
140154
- name: Install oneAPI basekit
141155
if: matrix.compiler.cxx == 'icpx'
142156
run: |
143-
sudo apt-get update
144-
sudo apt-get install -y gpg-agent wget
145-
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
146-
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
147-
sudo apt-get update
148-
sudo apt-get install -y intel-oneapi-ippcp-devel intel-oneapi-ipp-devel intel-oneapi-common-oneapi-vars intel-oneapi-compiler-dpcpp-cpp
157+
echo ${USERPASS} | sudo -Sk apt-get update
158+
echo ${USERPASS} | sudo -Sk apt-get install -y gpg-agent wget
159+
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | echo ${USERPASS} | sudo -Sk tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
160+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | echo ${USERPASS} | sudo -Sk tee /etc/apt/sources.list.d/oneAPI.list
161+
echo ${USERPASS} | sudo -Sk apt-get update
162+
echo ${USERPASS} | sudo -Sk apt-get install -y intel-oneapi-ippcp-devel intel-oneapi-ipp-devel intel-oneapi-common-oneapi-vars intel-oneapi-compiler-dpcpp-cpp
163+
164+
- name: Get UMF version
165+
run: |
166+
VERSION=$(git describe --tags --abbrev=0 | grep -oP '\d+\.\d+\.\d+')
167+
echo "UMF_VERSION=$VERSION" >> $GITHUB_ENV
149168
150169
- name: Configure build
151170
run: >
@@ -166,6 +185,7 @@ jobs:
166185
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
167186
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
168187
${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }}
188+
${{ matrix.llvm_linker || '' }}
169189
170190
- name: Build UMF
171191
run: |
@@ -178,14 +198,11 @@ jobs:
178198
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
179199
LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure
180200
181-
- name: Set OS name
182-
run: echo "OS_VER=ubuntu-${{ matrix.ubuntu_ver }}" >> $GITHUB_ENV
183-
184201
- name: Check coverage
185202
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
186203
working-directory: ${{env.BUILD_DIR}}
187204
run: |
188-
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{env.OS_VER}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
205+
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-ubuntu-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
189206
echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
190207
../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
191208
mkdir -p ${{env.COVERAGE_DIR}}
@@ -194,7 +211,7 @@ jobs:
194211
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
195212
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
196213
with:
197-
name: ${{env.COVERAGE_NAME}}-${{env.OS_VER}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
214+
name: ${{env.COVERAGE_NAME}}-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
198215
path: ${{env.COVERAGE_DIR}}
199216

200217
- name: Remove the installation directory

‎.github/workflows/reusable_dockers_build.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ jobs:
1515
strategy:
1616
matrix:
1717
ubuntu-version: [20.04, 22.04, 24.04]
18-
outputs:
19-
status: ${{ job.status }}
2018
env:
21-
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
2221

2322
steps:
2423
- name: Checkout repository
@@ -35,10 +34,12 @@ jobs:
3534
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
3635
with:
3736
registry: ghcr.io
38-
username: bb-ur
39-
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 }}
4041

4142
- name: Push ubuntu-${{ matrix.ubuntu-version }} Docker image
42-
if: github.event_name != 'pull_request'
43+
# if: github.event_name != 'pull_request'
4344
run: |
4445
docker push ${{ env.IMG }}

‎.github/workflows/reusable_fast.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ permissions:
99

1010
env:
1111
BUILD_DIR : "${{github.workspace}}/build"
12-
INSTL_DIR : "${{github.workspace}}/../install-dir"
12+
INSTL_DIR : "${{github.workspace}}/install-dir"
1313

1414
jobs:
1515
ubuntu-build:
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 --privileged
2122
volumes:
2223
- ${{ github.workspace }}:${{ github.workspace }}
2324
strategy:

0 commit comments

Comments
 (0)