.

Author: rbanka1

.github/docker/ubuntu-20.04.Dockerfile

@@ -24,13 +24,8 @@ ARG BASE_DEPS="\
 
 # Hwloc installation dependencies
 ARG HWLOC_DEPS="\
-	dos2unix \
 	libtool"
 
-# Copy hwloc
-# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
-COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
-
 # Dependencies for tests (optional)
 ARG TEST_DEPS="\
 	libnuma-dev \
@@ -47,6 +42,9 @@ ARG MISC_DEPS="\
 	sudo \
 	whois"
 
+# libhwloc-dev is required - installed via script because hwloc version is too old on this OS
+COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
+
 # Update and install required packages
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \

.github/docker/ubuntu-22.04.Dockerfile

@@ -20,8 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ARG BASE_DEPS="\
 	build-essential \
 	cmake \
-	git \
-	libtool"
+	git "
 
 # UMF's dependencies
 ARG UMF_DEPS="\

.github/workflows/pr_push.yml

@@ -19,14 +19,13 @@ permissions:
 jobs:
   CodeChecks:
     uses: ./.github/workflows/reusable_checks.yml
-  DocsBuild:
-    uses: ./.github/workflows/reusable_docs_build.yml
   FastBuild:
-    needs: [CodeChecks, DocsBuild]
+    needs: [CodeChecks]
     uses: ./.github/workflows/reusable_fast.yml
   Build:
     name: Basic builds
-    needs: [FastBuild]
+    needs: [CodeChecks]
+    # needs: [FastBuild]
     uses: ./.github/workflows/reusable_basic.yml
   DevDax:
     needs: [FastBuild]

.github/workflows/reusable_basic.yml

@@ -18,7 +18,8 @@ jobs:
     name: Ubuntu
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
+      # image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
+      image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
       options: --user root --privileged
       volumes:
         - ${{ github.workspace }}:${{ github.workspace }}
@@ -137,16 +138,37 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Install cmake (non-default version)
+      if: matrix.cmake_ver != 'default'
+      run: |
+        sudo apt-get remove --purge -y cmake
+        sudo apt-get update
+        sudo apt-get install -y wget
+        wget https://github.com/Kitware/CMake/releases/download/v${{matrix.cmake_ver}}/cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
+        chmod +x cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
+        sudo ./cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh --skip-license --prefix=/usr/local
+
+    - name: Install TBB apt package
+      if: matrix.install_tbb == 'OFF'
+      run: |
+        sudo apt-get remove --purge -y libtbb-dev
+
     - name: Install oneAPI basekit
       if: matrix.compiler.cxx == 'icpx'
       run: |
         sudo apt-get update
-        sudo apt-get install -y gpg-agent wget
+        # sudo apt-get install -y gpg-agent wget
         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
         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
         sudo apt-get update
         sudo apt-get install -y intel-oneapi-ippcp-devel intel-oneapi-ipp-devel intel-oneapi-common-oneapi-vars intel-oneapi-compiler-dpcpp-cpp
 
+    - name: Get UMF version
+      run: |
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        VERSION=$(git describe --tags --abbrev=0 | grep -oP '\d+\.\d+\.\d+')
+        echo "UMF_VERSION=$VERSION" >> $GITHUB_ENV
+
     - name: Configure build
       run: >
         ${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh &&' || ''}} 
@@ -166,6 +188,7 @@ jobs:
         -DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
         -DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
         ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }}
+        ${{ matrix.llvm_linker || '' }}
 
     - name: Build UMF
       run: |
@@ -178,14 +201,11 @@ jobs:
         ${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
         LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure
 
-    - name: Set OS name
-      run: echo "OS_VER=ubuntu-${{ matrix.ubuntu_ver }}" >> $GITHUB_ENV
-
     - name: Check coverage
       if:  ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
       working-directory: ${{env.BUILD_DIR}}
       run: |
-        export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{env.OS_VER}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
+        export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-ubuntu-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
         echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
         ../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
         mkdir -p ${{env.COVERAGE_DIR}}
@@ -194,7 +214,7 @@ jobs:
     - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       if:  ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
       with:
-        name: ${{env.COVERAGE_NAME}}-${{env.OS_VER}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
+        name: ${{env.COVERAGE_NAME}}-${{matrix.ubuntu_ver}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
         path: ${{env.COVERAGE_DIR}}
 
     - name: Remove the installation directory

.github/workflows/reusable_dockers_build.yml

@@ -15,10 +15,9 @@ jobs:
     strategy: 
       matrix:
         ubuntu-version: [20.04, 22.04, 24.04]
-    outputs: 
-      status: ${{ job.status }}
     env:
-      IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
+      # IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
+      IMG: ghcr.io/${{ github.actor }}/umf-ubuntu-${{ matrix.ubuntu-version }}:latest # test
 
     steps:
       - name: Checkout repository
@@ -35,10 +34,12 @@ jobs:
         uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
         with:
           registry: ghcr.io
-          username: bb-ur
-          password: ${{ secrets.BB_GHCR_TOKEN }}
+          username: ${{ github.actor }} # test
+          password: ${{ secrets.GHCR_TOKEN }} # test
+          # username: bb-ur
+          # password: ${{ secrets.BB_GHCR_TOKEN }}
 
       - name: Push ubuntu-${{ matrix.ubuntu-version }} Docker image
-        if: github.event_name != 'pull_request'
+        # if: github.event_name != 'pull_request'
         run: |
           docker push ${{ env.IMG }}

.github/workflows/reusable_fast.yml

@@ -9,14 +9,15 @@ permissions:
 
 env:
   BUILD_DIR : "${{github.workspace}}/build"
-  INSTL_DIR : "${{github.workspace}}/../install-dir"
+  INSTL_DIR : "${{github.workspace}}/install-dir"
 
 jobs:
   ubuntu-build:
     name: Linux
     runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
     container:
-      image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
+      # image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
+      image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
       options: --user root --privileged
       volumes:
         - ${{ github.workspace }}:${{ github.workspace }}