test

Author: rbanka1

.github/docker/ubuntu-20.04.Dockerfile

@@ -28,15 +28,17 @@ ARG HWLOC_DEPS="\
 	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
 
 # UMF's dependencies
-# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
+ARG UMF_DEPS="\
+	libtbb-dev"
 
 # Dependencies for tests (optional)
 ARG TEST_DEPS="\
 	libnuma-dev \
-	libtbb-dev\
+	libtbb-dev \
 	valgrind"
 
 # Miscellaneous for our builds/CI (optional)

.github/docker/ubuntu-22.04.Dockerfile

@@ -25,12 +25,12 @@ ARG BASE_DEPS="\
 
 # UMF's dependencies
 ARG UMF_DEPS="\
+	libtbb-dev \
 	libhwloc-dev"
 
 # Dependencies for tests (optional)
 ARG TEST_DEPS="\
 	libnuma-dev \
-	libtbb-dev\
 	valgrind"
 
 # Miscellaneous for our builds/CI (optional)

.github/docker/ubuntu-24.04.Dockerfile

@@ -25,12 +25,12 @@ ARG BASE_DEPS="\
 
 # UMF's dependencies
 ARG UMF_DEPS="\
+	libtbb-dev \
 	libhwloc-dev"
 
 # Dependencies for tests (optional)
 ARG TEST_DEPS="\
 	libnuma-dev \
-	libtbb-dev\
 	valgrind"
 
 # Miscellaneous for our builds/CI (optional)

.github/workflows/reusable_basic.yml

@@ -9,7 +9,7 @@ permissions:
 
 env:
   BUILD_DIR : "${{github.workspace}}/build"
-  INSTL_DIR : "${{github.workspace}}/../install-dir"
+  INSTL_DIR : "${{github.workspace}}/install-dir"
   COVERAGE_DIR : "${{github.workspace}}/coverage"
   COVERAGE_NAME : "exports-coverage-basic"
 

.github/workflows/reusable_dockers_build.yml

@@ -11,6 +11,7 @@ permissions:
 
 jobs: 
   build-dockers:
+    # if: github.repository == 'oneapi-src/unified-memory-framework'
     runs-on: ubuntu-latest
     strategy: 
       matrix:
@@ -26,14 +27,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Build ubuntu-${{ matrix.ubuntu-version }} Docker image
+        run: |
+          docker build -f .github/docker/ubuntu-${{ matrix.ubuntu-version }}.Dockerfile -t ${{ env.IMG }} .
+
       - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
-        with: 
+        with:
           registry: ghcr.io
           username: bb-ur
           password: ${{ secrets.BB_GHCR_TOKEN }}
 
-      - name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
+      - name: Push ubuntu-${{ matrix.ubuntu-version }} Docker image
+        if: github.event_name != 'pull_request'
         run: |
-          docker build -f .github/docker/ubuntu-${{ matrix.ubuntu-version }}.Dockerfile -t ${{ env.IMG }} .
           docker push ${{ env.IMG }}