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 .