replacing ubuntu with ubi8 binaries

3MFConsortium · Jan 24, 2024 · c86ed25 · c86ed25
1 parent 35e8951
commit c86ed25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 on: [push, pull_request]
 name: Build
 jobs:
-  build-linux:
+  build-linux-memtest:
     runs-on: ubuntu-20.04
     steps:
       - run: sudo apt update
@@ -12,19 +12,7 @@ jobs:
       - run: sh cmake/GenerateMake.sh
       - run: cmake --build . --target lib3mf_memcheck
         working-directory: ./build
-      - run: ctest -V
-        working-directory: ./build
-      - name: Archive Linux binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: lib3mf.so
-          path: build/lib3mf.so.2
-      - run: zip -r build/bindings.zip Autogenerated/Bindings
-      - name: Archive bindings
-        uses: actions/upload-artifact@v2
-        with:
-          name: bindings.zip
-          path: build/bindings.zip
+
   build-linux-ubi8-gcc12:
     runs-on: ubuntu-20.04
     steps:
@@ -58,7 +46,14 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: lib3mf.so
-          path: dist/lib3mf.so.2        
+          path: dist/lib3mf.so.2   
+
+      - run: zip -r build/bindings.zip Autogenerated/Bindings
+      - name: Archive bindings
+        uses: actions/upload-artifact@v2
+        with:
+          name: bindings.zip
+          path: build/bindings.zip
 
   build-macos:
     runs-on: macos-latest

diff --git a/CI/Dockerfile b/CI/Dockerfile
@@ -7,17 +7,12 @@ ENV GCCTOOLSET=gcc-toolset-12
 RUN \
     microdnf update -y && \
     microdnf -y install --nodocs \
-    git \
-    git-lfs \
     wget \
     which \
     libuuid-devel \
     glibc-langpack-en \
-    python39-pip \
     tar \
     gzip \
-    zip \
-    unzip \
     ${GCCTOOLSET} \
     && microdnf clean all
 
@@ -36,18 +31,10 @@ RUN ln -s /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin/cmake /usr/bin/cmake3
 RUN ln -s /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin/cpack /usr/bin/cpack3
 RUN ln -s /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin/ctest /usr/bin/ctest3
 
-# Add Python site to PATH
-ENV PATH /root/.local/bin:${PATH}
-
-
 
 RUN ldd --version
 RUN cmake --version
 RUN cmake3 --version
-RUN git --version
-RUN git lfs version
-RUN python3 --version
-RUN pip3 --version
 RUN gcc --version