From 059bd013d2cfe81f027d724532e60e3e94343adc Mon Sep 17 00:00:00 2001 From: gangatp Date: Tue, 23 Jan 2024 18:40:44 +0530 Subject: [PATCH 01/11] adding docker file --- .github/workflows/build.yml | 19 ++++++++++++++++++- CI/Dockerfile | 20 +++++++++++++++++--- CI/script.sh | 7 ------- 3 files changed, 35 insertions(+), 11 deletions(-) delete mode 100644 CI/script.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ccfd7a37f..35d0f0df7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,24 @@ jobs: with: name: bindings.zip path: build/bindings.zip + build-linux-ubi8-gcc12: + runs-on: ubuntu-20.04 + steps: + - run: sudo apt update + - run: sudo apt install -y uuid-dev + - uses: actions/checkout@v2 + with: + submodules: true + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Build + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64 build-macos: runs-on: macos-latest steps: @@ -41,7 +59,6 @@ jobs: with: name: lib3mf.dylib path: build/lib3mf.dylib - codecoverage-macos: runs-on: macos-latest steps: diff --git a/CI/Dockerfile b/CI/Dockerfile index 3f5d7d56a..94dec0242 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -1,4 +1,18 @@ -FROM martinweismann/lib3mf_ppcbuilds:latest +# Copy this to root folder of lib3mf then build and run this image. +FROM ubuntu:20.04 + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install build-essential uuid-dev wget + +RUN wget -qO- "https://cmake.org/files/v3.28/cmake-3.28.1-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local + ADD . lib3mf-repo -ADD CI/script.sh script.sh -ENTRYPOINT ["sh", "script.sh"] + +WORKDIR "/lib3mf-repo" + +RUN cmake/GenerateMake.sh + +WORKDIR "/lib3mf-repo/build" + +RUN cmake --build . + +RUN ctest -V . diff --git a/CI/script.sh b/CI/script.sh deleted file mode 100644 index 389ab6362..000000000 --- a/CI/script.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -cd lib3mf-repo -sh cmake/GenerateMakeFast.sh -cd build -make -j1 -ctest -V . From b88a959d1433290e71aac159c5eebd2276e585ad Mon Sep 17 00:00:00 2001 From: gangatp Date: Tue, 23 Jan 2024 18:41:39 +0530 Subject: [PATCH 02/11] adding dockerfile --- Dockerfile | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..6d4bf12e1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,79 @@ +FROM registry.access.redhat.com/ubi8/ubi-minimal:latest + +LABEL maintainer="pradeep.gangatharan@autodesk.com" + +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 \ + ${GCCTOOLSET} \ + && microdnf clean all + +ENV LD_LIBRARY_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64:/opt/rh/${GCCTOOLSET}/root/usr/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +ENV PKG_CONFIG_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} +ENV PATH=/opt/rh/${GCCTOOLSET}/root/usr/bin${PATH:+:${PATH}} + +# CMake +ARG CMAKE_VERSION=3.28.1 +ADD "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz" /usr/tmp/ +RUN tar xzf /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz -C /opt && rm /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz +ENV PATH /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin:${PATH} + + +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 + + +ADD . lib3mf-repo + +WORKDIR "/lib3mf-repo" + +RUN cmake/GenerateMake.sh + +WORKDIR "/lib3mf-repo/build" + +RUN cmake --build . + +RUN ctest -V . + +WORKDIR "/../../" + +RUN mkdir out + +RUN mkdir out/Bindings + +RUN cp ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ + +RUN cp ./lib3mf-repo/build/lib3mf.so ./out/ + +RUN tar czf out.tar.gz out + + + + + From 41a8bb7af6ce9eadd68200d5cbd542aca33b184b Mon Sep 17 00:00:00 2001 From: gangatp Date: Tue, 23 Jan 2024 20:10:51 +0530 Subject: [PATCH 03/11] giving permissions to cmake file --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d4bf12e1..64d1114d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,8 @@ ADD . lib3mf-repo WORKDIR "/lib3mf-repo" +RUN chmod +x cmake/GenerateMake.sh + RUN cmake/GenerateMake.sh WORKDIR "/lib3mf-repo/build" @@ -67,7 +69,7 @@ RUN mkdir out RUN mkdir out/Bindings -RUN cp ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ +RUN cp -r ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ RUN cp ./lib3mf-repo/build/lib3mf.so ./out/ From cbc1a52244ae1623a4287ec696818f6cdcd3a26d Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 09:30:31 +0530 Subject: [PATCH 04/11] build ubi8 image --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35d0f0df7..084fade29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,12 +37,28 @@ jobs: name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build + name: Docker Build uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile platforms: linux/amd64 + tags: lib3mf_ubi8:latest + load: true + - + name: Docker Extract + uses: shrink/actions-docker-extract@v3.0.0 + id: extract + with: + image: lib3mf_ubi8:latest + path: /out.tar.gz + - + name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: lib3mf.tar.gz + path: ${{ github.workspace }}/out.tar.gz + build-macos: runs-on: macos-latest steps: From 6c10b132948968fde6c6b22bf86e8c6c26acc763 Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 09:46:07 +0530 Subject: [PATCH 05/11] adding destination in artifact --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 084fade29..bc5822089 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,12 +52,13 @@ jobs: with: image: lib3mf_ubi8:latest path: /out.tar.gz + destination: dist - name: Upload Artifact uses: actions/upload-artifact@v2 with: - name: lib3mf.tar.gz - path: ${{ github.workspace }}/out.tar.gz + name: lib3mf_ubi8_gcc12.tar.gz + path: dist build-macos: runs-on: macos-latest From 1e7d15a4c8cebe12f22c23a3a56b5002b9161310 Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 10:26:43 +0530 Subject: [PATCH 06/11] using zip instead of tar --- .github/workflows/build.yml | 6 +++--- Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc5822089..d289a6c9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,14 +51,14 @@ jobs: id: extract with: image: lib3mf_ubi8:latest - path: /out.tar.gz + path: /out.zip destination: dist - name: Upload Artifact uses: actions/upload-artifact@v2 with: - name: lib3mf_ubi8_gcc12.tar.gz - path: dist + name: lib3mf_ubi8_gcc12.zip + path: dist/out.zip build-macos: runs-on: macos-latest diff --git a/Dockerfile b/Dockerfile index 64d1114d0..e396e0b24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,8 @@ RUN \ python39-pip \ tar \ gzip \ + zip \ + unzip \ ${GCCTOOLSET} \ && microdnf clean all @@ -73,7 +75,7 @@ RUN cp -r ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ RUN cp ./lib3mf-repo/build/lib3mf.so ./out/ -RUN tar czf out.tar.gz out +RUN zip -r out.zip out From a1a744f138fd7947eb2032e61a0e886d63bb6d2a Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 11:50:21 +0530 Subject: [PATCH 07/11] ignoring parent folder while zipping --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e396e0b24..6285f34a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN cp -r ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ RUN cp ./lib3mf-repo/build/lib3mf.so ./out/ -RUN zip -r out.zip out +RUN cd out && zip -r ../out.zip . From 35e8951da29ccf8a2231211fbd0cb02ba48d0a2e Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 15:28:20 +0530 Subject: [PATCH 08/11] replacing ubuntu with ubi8 binaries --- .github/workflows/build.yml | 10 ++--- CI/Dockerfile | 62 +++++++++++++++++++++++++-- CI/Dockerfile.ubuntu | 18 ++++++++ Dockerfile | 83 ------------------------------------- 4 files changed, 81 insertions(+), 92 deletions(-) create mode 100644 CI/Dockerfile.ubuntu delete mode 100644 Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d289a6c9e..f846c5898 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ./Dockerfile + file: ./CI/Dockerfile platforms: linux/amd64 tags: lib3mf_ubi8:latest load: true @@ -51,14 +51,14 @@ jobs: id: extract with: image: lib3mf_ubi8:latest - path: /out.zip + path: /lib3mf-repo/build/lib3mf.so.2 destination: dist - name: Upload Artifact uses: actions/upload-artifact@v2 with: - name: lib3mf_ubi8_gcc12.zip - path: dist/out.zip + name: lib3mf.so + path: dist/lib3mf.so.2 build-macos: runs-on: macos-latest @@ -175,7 +175,7 @@ jobs: working-directory: ./build assemble-sdk: runs-on: ubuntu-20.04 - needs: [build-windows-release, build-linux, build-macos] + needs: [build-windows-release, build-macos, build-linux-ubi8-gcc12] steps: - run: sudo apt install -y zip unzip - run: mkdir build diff --git a/CI/Dockerfile b/CI/Dockerfile index 94dec0242..3c24e9521 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -1,14 +1,62 @@ -# Copy this to root folder of lib3mf then build and run this image. -FROM ubuntu:20.04 +FROM registry.access.redhat.com/ubi8/ubi-minimal:latest -RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install build-essential uuid-dev wget +LABEL maintainer="pradeep.gangatharan@autodesk.com" + +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 + +ENV LD_LIBRARY_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64:/opt/rh/${GCCTOOLSET}/root/usr/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +ENV PKG_CONFIG_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} +ENV PATH=/opt/rh/${GCCTOOLSET}/root/usr/bin${PATH:+:${PATH}} + +# CMake +ARG CMAKE_VERSION=3.28.1 +ADD "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz" /usr/tmp/ +RUN tar xzf /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz -C /opt && rm /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz +ENV PATH /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin:${PATH} + + +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 -RUN wget -qO- "https://cmake.org/files/v3.28/cmake-3.28.1-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local ADD . lib3mf-repo WORKDIR "/lib3mf-repo" +RUN chmod +x cmake/GenerateMake.sh + RUN cmake/GenerateMake.sh WORKDIR "/lib3mf-repo/build" @@ -16,3 +64,9 @@ WORKDIR "/lib3mf-repo/build" RUN cmake --build . RUN ctest -V . + +WORKDIR "/../../" + + + + diff --git a/CI/Dockerfile.ubuntu b/CI/Dockerfile.ubuntu new file mode 100644 index 000000000..94dec0242 --- /dev/null +++ b/CI/Dockerfile.ubuntu @@ -0,0 +1,18 @@ +# Copy this to root folder of lib3mf then build and run this image. +FROM ubuntu:20.04 + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install build-essential uuid-dev wget + +RUN wget -qO- "https://cmake.org/files/v3.28/cmake-3.28.1-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local + +ADD . lib3mf-repo + +WORKDIR "/lib3mf-repo" + +RUN cmake/GenerateMake.sh + +WORKDIR "/lib3mf-repo/build" + +RUN cmake --build . + +RUN ctest -V . diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 6285f34a8..000000000 --- a/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest - -LABEL maintainer="pradeep.gangatharan@autodesk.com" - -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 - -ENV LD_LIBRARY_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64:/opt/rh/${GCCTOOLSET}/root/usr/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -ENV PKG_CONFIG_PATH=/opt/rh/${GCCTOOLSET}/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -ENV PATH=/opt/rh/${GCCTOOLSET}/root/usr/bin${PATH:+:${PATH}} - -# CMake -ARG CMAKE_VERSION=3.28.1 -ADD "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz" /usr/tmp/ -RUN tar xzf /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz -C /opt && rm /usr/tmp/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz -ENV PATH /opt/cmake-$CMAKE_VERSION-linux-x86_64/bin:${PATH} - - -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 - - -ADD . lib3mf-repo - -WORKDIR "/lib3mf-repo" - -RUN chmod +x cmake/GenerateMake.sh - -RUN cmake/GenerateMake.sh - -WORKDIR "/lib3mf-repo/build" - -RUN cmake --build . - -RUN ctest -V . - -WORKDIR "/../../" - -RUN mkdir out - -RUN mkdir out/Bindings - -RUN cp -r ./lib3mf-repo/Autogenerated/Bindings/. ./out/Bindings/ - -RUN cp ./lib3mf-repo/build/lib3mf.so ./out/ - -RUN cd out && zip -r ../out.zip . - - - - - From c86ed25b80f978bbeb870cbc2c61cc9dd2ec55b7 Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 16:20:14 +0530 Subject: [PATCH 09/11] replacing ubuntu with ubi8 binaries --- .github/workflows/build.yml | 25 ++++++++++--------------- CI/Dockerfile | 13 ------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f846c5898..5d73eedea 100644 --- 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 index 3c24e9521..39c470c6c 100644 --- 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 From df462ec1872a7b87b735506d10b3607f42a91233 Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 18:45:02 +0530 Subject: [PATCH 10/11] creating artifacts from ubi8 --- .github/workflows/build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d73eedea..ca1ead393 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,14 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - run: mkdir -p build + - run: zip -r build/bindings.zip Autogenerated/Bindings + + - name: Archive bindings + uses: actions/upload-artifact@v2 + with: + name: bindings.zip + path: build/bindings.zip - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -39,7 +47,7 @@ jobs: id: extract with: image: lib3mf_ubi8:latest - path: /lib3mf-repo/build/lib3mf.so.2 + path: lib3mf-repo/build/lib3mf.so.2 destination: dist - name: Upload Artifact @@ -47,13 +55,6 @@ jobs: with: name: lib3mf.so 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 From 7ec201198ac92ae2874fa0a0c01cbe983c435887 Mon Sep 17 00:00:00 2001 From: gangatp Date: Wed, 24 Jan 2024 20:03:28 +0530 Subject: [PATCH 11/11] fixing lib3mf linux export --- .github/workflows/build.yml | 5 ++++- CI/Dockerfile | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca1ead393..96a237c83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,8 +47,11 @@ jobs: id: extract with: image: lib3mf_ubi8:latest - path: lib3mf-repo/build/lib3mf.so.2 + path: out.zip destination: dist + + - run: unzip out.zip + working-directory: ./dist - name: Upload Artifact uses: actions/upload-artifact@v2 diff --git a/CI/Dockerfile b/CI/Dockerfile index 39c470c6c..846332f66 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -13,6 +13,7 @@ RUN \ glibc-langpack-en \ tar \ gzip \ + zip \ ${GCCTOOLSET} \ && microdnf clean all @@ -54,6 +55,16 @@ RUN ctest -V . WORKDIR "/../../" +RUN mkdir -p out + +RUN cp ./lib3mf-repo/build/lib3mf.so.2 ./out/ + +RUN cd out && zip -r ../out.zip . + + + + +