From 0f9308fab2aad649cf6d22cc3948e4141db272da Mon Sep 17 00:00:00 2001 From: guillaume Date: Thu, 22 Feb 2024 13:13:23 +0000 Subject: [PATCH 1/6] feat:build for arm64 --- .github/workflows/build-image.yml | 3 + .github/workflows/build-packages.yml | 18 +++++- .github/workflows/build.yml | 52 ++++++++++++++++ docker/development/Dockerfile | 92 ++++++++++++++-------------- 4 files changed, 118 insertions(+), 47 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 3e86645..0f296f8 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -33,6 +33,8 @@ jobs: with: fetch-depth: 0 lfs: true + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to DockerHub @@ -52,4 +54,5 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max target: root-user + platforms: linux/amd64,linux/arm64 push: true diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index e1d93b3..90d25db 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -27,12 +27,20 @@ jobs: build-package-cpp: name: Build C++ Package runs-on: ubuntu-latest + strategy: + matrix: + architecture: [amd64, arm64] steps: - name: Checkout Repository uses: actions/checkout@v3 with: fetch-depth: 0 lfs: true + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + if: matrix.architecture == 'arm64' + with: + platforms: arm64 - name: Login to DockerHub uses: docker/login-action@v2 with: @@ -41,7 +49,7 @@ jobs: - name: Pull Development Image run: docker pull ${{ env.DOCKER_REGISTRY_PATH }}/${{ inputs.project_name }}-development:${{ inputs.project_version }} - name: Build C++ Package - run: make build-packages-cpp-standalone + run: make build-packages-cpp-standalone PLATFORM=${{ matrix.architecture }} - name: Upload C++ Package uses: actions/upload-artifact@v3 with: @@ -51,12 +59,20 @@ jobs: build-package-python: name: Build Python Package runs-on: ubuntu-latest + strategy: + matrix: + architecture: [amd64, arm64] steps: - name: Checkout Repository uses: actions/checkout@v3 with: fetch-depth: 0 lfs: true + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + if: matrix.architecture == 'arm64' + with: + platforms: arm64 - name: Login to DockerHub uses: docker/login-action@v2 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b40c4d2 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,52 @@ +# Apache License 2.0 + +name: Build + +on: + push: + branches: + - main + pull_request: + + +concurrency: + group: main-${{ github.ref }} + cancel-in-progress: true + +env: + PROJECT_NAME: open-space-toolkit-base + +jobs: + prepare-environment: + name: Prepare Environment Variables + runs-on: ubuntu-latest + outputs: + project_name: ${{ steps.project-name.outputs.value }} + project_version: ${{ steps.project-version.outputs.value }} + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + lfs: true + - id: project-name + name: Get Project Name + run: | + echo "Project name: ${{ env.PROJECT_NAME }}" + echo "value=${{ env.PROJECT_NAME }}" >> $GITHUB_OUTPUT + - id: project-version + name: Get Project Version + run: | + project_version=$(git describe --tags --always) + echo "Project version: ${project_version}" + echo "value=${project_version}" >> $GITHUB_OUTPUT + + build-development-image: + name: Build Development Image + needs: + - prepare-environment + uses: ./.github/workflows/build-image.yml + with: + project_name: ${{ needs.prepare-environment.outputs.project_name }} + project_version: ${{ needs.prepare-environment.outputs.project_version }} + secrets: inherit \ No newline at end of file diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index c94eceb..0eb19ed 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -1,6 +1,6 @@ # Apache License 2.0 -FROM ubuntu:20.04 +FROM ubuntu:20.04 as root-user LABEL maintainer="lucas.bremond@gmail.com" @@ -169,51 +169,51 @@ RUN cd /tmp \ # Dependencies -## Pybind11 - -ARG PYBIND_11_VERSION="2.10.3-1" - -RUN mkdir /tmp/pybind11 \ - && cd /tmp/pybind11 \ - && wget http://ftp.us.debian.org/debian/pool/main/p/pybind11/pybind11-dev_${PYBIND_11_VERSION}_all.deb \ - && apt-get install -y ./pybind11-dev_${PYBIND_11_VERSION}_all.deb \ - && rm -rf /tmp/pybind11 - -## Boost - -ARG BOOST_MAJOR_VERSION="1" -ARG BOOST_MINOR_VERSION="82" -ARG BOOST_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.0" - -RUN mkdir -p /tmp/boost \ - && cd /tmp/boost \ - && wget -O boost_${BOOST_VERSION}.tar.gz https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0.tar.gz/download \ - && tar -xf boost_${BOOST_VERSION}.tar.gz \ - && cd boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0 \ - && ./bootstrap.sh --with-python=/usr/local/bin/python3.10 \ - && echo "using python : 3.10 : /usr : /usr/include/python3.10m ;" >> project-config.jam \ - && ./b2 -j $(nproc) link=static cxxflags=-fPIC install \ - && ./b2 -j $(nproc) python=3.10 link=shared cxxflags=-fPIC install \ - && rm -rf /tmp/boost - -## OpenSSL - -ARG OPENSSL_VERSION="3.0.2" - -RUN mkdir /tmp/openssl \ - && cd /tmp/openssl \ - && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ - && tar -xvf openssl-${OPENSSL_VERSION}.tar.gz \ - && cd openssl-${OPENSSL_VERSION} \ - && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib \ - && make \ - && make install \ - && touch /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ - && echo "/usr/local/ssl/lib64" >> /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ - && ldconfig \ - && mv /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash \ - && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ - && rm -rf /tmp/openssl +# ## Pybind11 + +# ARG PYBIND_11_VERSION="2.10.3-1" + +# RUN mkdir /tmp/pybind11 \ +# && cd /tmp/pybind11 \ +# && wget http://ftp.us.debian.org/debian/pool/main/p/pybind11/pybind11-dev_${PYBIND_11_VERSION}_all.deb \ +# && apt-get install -y ./pybind11-dev_${PYBIND_11_VERSION}_all.deb \ +# && rm -rf /tmp/pybind11 + +# ## Boost + +# ARG BOOST_MAJOR_VERSION="1" +# ARG BOOST_MINOR_VERSION="82" +# ARG BOOST_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.0" + +# RUN mkdir -p /tmp/boost \ +# && cd /tmp/boost \ +# && wget -O boost_${BOOST_VERSION}.tar.gz https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0.tar.gz/download \ +# && tar -xf boost_${BOOST_VERSION}.tar.gz \ +# && cd boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0 \ +# && ./bootstrap.sh --with-python=/usr/local/bin/python3.10 \ +# && echo "using python : 3.10 : /usr : /usr/include/python3.10m ;" >> project-config.jam \ +# && ./b2 -j $(nproc) link=static cxxflags=-fPIC install \ +# && ./b2 -j $(nproc) python=3.10 link=shared cxxflags=-fPIC install \ +# && rm -rf /tmp/boost + +# ## OpenSSL + +# ARG OPENSSL_VERSION="3.0.2" + +# RUN mkdir /tmp/openssl \ +# && cd /tmp/openssl \ +# && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ +# && tar -xvf openssl-${OPENSSL_VERSION}.tar.gz \ +# && cd openssl-${OPENSSL_VERSION} \ +# && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib \ +# && make \ +# && make install \ +# && touch /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ +# && echo "/usr/local/ssl/lib64" >> /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ +# && ldconfig \ +# && mv /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash \ +# && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ +# && rm -rf /tmp/openssl ## Black From 5b4feb92b9ecbee00c1c580e6ff7b2a3b92dec5b Mon Sep 17 00:00:00 2001 From: Guillaume MARCENAC Date: Fri, 23 Feb 2024 18:17:50 +0100 Subject: [PATCH 2/6] feat:enable full image --- .github/workflows/build-packages.yml | 2 +- docker/development/Dockerfile | 86 ++++++++++++++-------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 90d25db..a8a1de4 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -81,7 +81,7 @@ jobs: - name: Pull Development Image run: docker pull ${{ env.DOCKER_REGISTRY_PATH }}/${{ inputs.project_name }}-development:${{ inputs.project_version }} - name: Build Python Package - run: make build-packages-python-standalone + run: make build-packages-python-standalone PLATFORM=${{ matrix.architecture }} - name: Upload Python Package uses: actions/upload-artifact@v3 with: diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 0eb19ed..1231aa5 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -171,49 +171,49 @@ RUN cd /tmp \ # ## Pybind11 -# ARG PYBIND_11_VERSION="2.10.3-1" - -# RUN mkdir /tmp/pybind11 \ -# && cd /tmp/pybind11 \ -# && wget http://ftp.us.debian.org/debian/pool/main/p/pybind11/pybind11-dev_${PYBIND_11_VERSION}_all.deb \ -# && apt-get install -y ./pybind11-dev_${PYBIND_11_VERSION}_all.deb \ -# && rm -rf /tmp/pybind11 - -# ## Boost - -# ARG BOOST_MAJOR_VERSION="1" -# ARG BOOST_MINOR_VERSION="82" -# ARG BOOST_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.0" - -# RUN mkdir -p /tmp/boost \ -# && cd /tmp/boost \ -# && wget -O boost_${BOOST_VERSION}.tar.gz https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0.tar.gz/download \ -# && tar -xf boost_${BOOST_VERSION}.tar.gz \ -# && cd boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0 \ -# && ./bootstrap.sh --with-python=/usr/local/bin/python3.10 \ -# && echo "using python : 3.10 : /usr : /usr/include/python3.10m ;" >> project-config.jam \ -# && ./b2 -j $(nproc) link=static cxxflags=-fPIC install \ -# && ./b2 -j $(nproc) python=3.10 link=shared cxxflags=-fPIC install \ -# && rm -rf /tmp/boost - -# ## OpenSSL - -# ARG OPENSSL_VERSION="3.0.2" - -# RUN mkdir /tmp/openssl \ -# && cd /tmp/openssl \ -# && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ -# && tar -xvf openssl-${OPENSSL_VERSION}.tar.gz \ -# && cd openssl-${OPENSSL_VERSION} \ -# && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib \ -# && make \ -# && make install \ -# && touch /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ -# && echo "/usr/local/ssl/lib64" >> /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ -# && ldconfig \ -# && mv /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash \ -# && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ -# && rm -rf /tmp/openssl +ARG PYBIND_11_VERSION="2.10.3-1" + +RUN mkdir /tmp/pybind11 \ + && cd /tmp/pybind11 \ + && wget http://ftp.us.debian.org/debian/pool/main/p/pybind11/pybind11-dev_${PYBIND_11_VERSION}_all.deb \ + && apt-get install -y ./pybind11-dev_${PYBIND_11_VERSION}_all.deb \ + && rm -rf /tmp/pybind11 + +## Boost + +ARG BOOST_MAJOR_VERSION="1" +ARG BOOST_MINOR_VERSION="82" +ARG BOOST_VERSION="${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.0" + +RUN mkdir -p /tmp/boost \ + && cd /tmp/boost \ + && wget -O boost_${BOOST_VERSION}.tar.gz https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0.tar.gz/download \ + && tar -xf boost_${BOOST_VERSION}.tar.gz \ + && cd boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_0 \ + && ./bootstrap.sh --with-python=/usr/local/bin/python3.10 \ + && echo "using python : 3.10 : /usr : /usr/include/python3.10m ;" >> project-config.jam \ + && ./b2 -j $(nproc) link=static cxxflags=-fPIC install \ + && ./b2 -j $(nproc) python=3.10 link=shared cxxflags=-fPIC install \ + && rm -rf /tmp/boost + +## OpenSSL + +ARG OPENSSL_VERSION="3.0.2" + +RUN mkdir /tmp/openssl \ + && cd /tmp/openssl \ + && wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \ + && tar -xvf openssl-${OPENSSL_VERSION}.tar.gz \ + && cd openssl-${OPENSSL_VERSION} \ + && ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib \ + && make \ + && make install \ + && touch /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ + && echo "/usr/local/ssl/lib64" >> /etc/ld.so.conf.d/openssl-${OPENSSL_VERSION}.conf \ + && ldconfig \ + && mv /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash \ + && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ + && rm -rf /tmp/openssl ## Black From dabaca3839889c1d5f29bc34c7a68a261664c521 Mon Sep 17 00:00:00 2001 From: guillaumeloftorbital <65620577+guillaumeloftorbital@users.noreply.github.com> Date: Sat, 24 Feb 2024 18:47:44 +0100 Subject: [PATCH 3/6] Update docker/development/Dockerfile Co-authored-by: Antoine Paletta <98616558+apaletta3@users.noreply.github.com> --- docker/development/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 1231aa5..edd098a 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -169,7 +169,7 @@ RUN cd /tmp \ # Dependencies -# ## Pybind11 +## Pybind11 ARG PYBIND_11_VERSION="2.10.3-1" From 2957a164e4541928f71b9d0468b99623e17c7ff6 Mon Sep 17 00:00:00 2001 From: Guillaume MARCENAC Date: Fri, 23 Feb 2024 18:17:50 +0100 Subject: [PATCH 4/6] feat:enable full image --- .github/workflows/{build.yml => build-base-image.yml} | 2 +- .github/workflows/build-image.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename .github/workflows/{build.yml => build-base-image.yml} (97%) diff --git a/.github/workflows/build.yml b/.github/workflows/build-base-image.yml similarity index 97% rename from .github/workflows/build.yml rename to .github/workflows/build-base-image.yml index b40c4d2..a06918c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-base-image.yml @@ -1,6 +1,6 @@ # Apache License 2.0 -name: Build +name: Build Base Development Image on: push: diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 0f296f8..1f648ad 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -27,6 +27,7 @@ jobs: build-image-development: name: Build Development Image runs-on: ubuntu-latest + timeout-minutes: 600 steps: - name: Checkout Repository uses: actions/checkout@v3 From 5501a1ebe570aaac6efc33129aeb1ae6d106d8bc Mon Sep 17 00:00:00 2001 From: Guillaume MARCENAC Date: Mon, 11 Mar 2024 21:05:55 +0100 Subject: [PATCH 5/6] fix: improve CI performance --- .github/workflows/build-base-image.yml | 39 ++++++++++++++++++++++++++ .github/workflows/build-image.yml | 15 ++++++++-- docker/development/Dockerfile | 8 +++++- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml index a06918c..3eb63e1 100644 --- a/.github/workflows/build-base-image.yml +++ b/.github/workflows/build-base-image.yml @@ -41,10 +41,49 @@ jobs: echo "Project version: ${project_version}" echo "value=${project_version}" >> $GITHUB_OUTPUT + build-base1-image: + name: Build Base1 Image + needs: + - prepare-environment + uses: ./.github/workflows/build-image.yml + with: + project_name: ${{ needs.prepare-environment.outputs.project_name }} + project_version: ${{ needs.prepare-environment.outputs.project_version }} + push: false + target: base1 + secrets: inherit + + build-base2-image: + name: Build Base2 Image + needs: + - prepare-environment + - build-base1-image + uses: ./.github/workflows/build-image.yml + with: + project_name: ${{ needs.prepare-environment.outputs.project_name }} + project_version: ${{ needs.prepare-environment.outputs.project_version }} + push: false + target: base2 + secrets: inherit + + build-base3-image: + name: Build Base3 Image + needs: + - prepare-environment + - build-base2-image + uses: ./.github/workflows/build-image.yml + with: + project_name: ${{ needs.prepare-environment.outputs.project_name }} + project_version: ${{ needs.prepare-environment.outputs.project_version }} + push: false + target: base3 + secrets: inherit + build-development-image: name: Build Development Image needs: - prepare-environment + - build-base3-image uses: ./.github/workflows/build-image.yml with: project_name: ${{ needs.prepare-environment.outputs.project_name }} diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 1f648ad..d28cf9f 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -13,6 +13,16 @@ on: description: The version of the project. required: true type: string + push: + description: Push the image to the registry. + default: true + required: false + type: boolean + target: + description: The target to build. + default: root-user + required: false + type: string secrets: DOCKERHUB_USERNAME: required: true @@ -27,7 +37,6 @@ jobs: build-image-development: name: Build Development Image runs-on: ubuntu-latest - timeout-minutes: 600 steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -54,6 +63,6 @@ jobs: VERSION=${{ inputs.project_version }} cache-from: type=gha cache-to: type=gha,mode=max - target: root-user + target: ${{ inputs.target }} platforms: linux/amd64,linux/arm64 - push: true + push: ${{ inputs.push }} \ No newline at end of file diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index edd098a..8c2dce8 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -1,6 +1,6 @@ # Apache License 2.0 -FROM ubuntu:20.04 as root-user +FROM ubuntu:20.04 as base1 LABEL maintainer="lucas.bremond@gmail.com" @@ -93,6 +93,7 @@ RUN mkdir -p /tmp/py39 \ && make altinstall \ && rm -rf /tmp/py39 +FROM base1 as base2 ## Python 3.10 ARG PYTHON_3_10_VERSION="3.10.9" @@ -119,6 +120,9 @@ RUN mkdir -p /tmp/py311 \ && make altinstall \ && rm -rf /tmp/py311 + +FROM base2 as base3 + ## Python tools RUN apt-get update -y \ @@ -215,6 +219,8 @@ RUN mkdir /tmp/openssl \ && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ && rm -rf /tmp/openssl +FROM base3 as root-user + ## Black RUN python3.11 -m pip install black black[jupyter] From a1a577b84e73c747d25e22ba332384f63d58fe4d Mon Sep 17 00:00:00 2001 From: Antoine Paletta Date: Mon, 18 Mar 2024 15:43:47 +0000 Subject: [PATCH 6/6] fix: remove arm64 off of main --- .github/workflows/build-base-image.yml | 15 ++------------- .github/workflows/build-image.yml | 4 ++-- .github/workflows/build-packages.yml | 4 ++-- .github/workflows/release.yml | 2 +- docker/development/Dockerfile | 2 -- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml index 3eb63e1..b852c31 100644 --- a/.github/workflows/build-base-image.yml +++ b/.github/workflows/build-base-image.yml @@ -52,7 +52,7 @@ jobs: push: false target: base1 secrets: inherit - + build-base2-image: name: Build Base2 Image needs: @@ -75,17 +75,6 @@ jobs: with: project_name: ${{ needs.prepare-environment.outputs.project_name }} project_version: ${{ needs.prepare-environment.outputs.project_version }} - push: false + push: true target: base3 secrets: inherit - - build-development-image: - name: Build Development Image - needs: - - prepare-environment - - build-base3-image - uses: ./.github/workflows/build-image.yml - with: - project_name: ${{ needs.prepare-environment.outputs.project_name }} - project_version: ${{ needs.prepare-environment.outputs.project_version }} - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index d28cf9f..1dd57d2 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -1,6 +1,6 @@ # Apache License 2.0 -name: Build Image +name: Build Development Image on: workflow_call: @@ -65,4 +65,4 @@ jobs: cache-to: type=gha,mode=max target: ${{ inputs.target }} platforms: linux/amd64,linux/arm64 - push: ${{ inputs.push }} \ No newline at end of file + push: ${{ inputs.push }} diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index a8a1de4..9409d2e 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -38,7 +38,7 @@ jobs: lfs: true - name: Set up QEMU uses: docker/setup-qemu-action@v2 - if: matrix.architecture == 'arm64' + if: matrix.architecture == 'arm64' && github.event_name == 'push' && github.ref == 'refs/heads/main' with: platforms: arm64 - name: Login to DockerHub @@ -70,7 +70,7 @@ jobs: lfs: true - name: Set up QEMU uses: docker/setup-qemu-action@v2 - if: matrix.architecture == 'arm64' + if: matrix.architecture == 'arm64' && github.event_name == 'push' && github.ref == 'refs/heads/main' with: platforms: arm64 - name: Login to DockerHub diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 058bca5..703c75c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} - packages_dir: packages/python/ + packages-dir: packages/python/ deploy-documentation: name: Deploy Documentation diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 8c2dce8..cfe8248 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -219,8 +219,6 @@ RUN mkdir /tmp/openssl \ && mv /usr/local/ssl/bin/openssl /usr/bin/openssl \ && rm -rf /tmp/openssl -FROM base3 as root-user - ## Black RUN python3.11 -m pip install black black[jupyter]