diff --git a/.github/workflows/Build Image.yml b/.github/workflows/Build Image.yml index d42ed00..6a3b1d4 100644 --- a/.github/workflows/Build Image.yml +++ b/.github/workflows/Build Image.yml @@ -11,7 +11,10 @@ on: jobs: build: runs-on: ubuntu-latest - name: Publish Package job + strategy: + matrix: + platform: [linux/arm64, linux/amd64, linux/arm/v6, linux/arm/v7, linux/ppc64le] + name: Publish Package job for ${{ matrix.platform }} steps: - @@ -29,8 +32,8 @@ jobs: uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.repository_owner }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME value=dockerid - password: ${{ secrets.GITHUB_TOKEN }} # dockerServer Token + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} continue-on-error: true - id: login-dockerhub @@ -38,8 +41,8 @@ jobs: uses: docker/login-action@v3 with: registry: docker.io - username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME value=dockerid - password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD value=dockerToken + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} continue-on-error: true - id: meta @@ -54,10 +57,10 @@ jobs: type=ref,event=tag - name: Publish Package - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile - platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/ppc64le # 你准备构建的镜像平台 + platforms: ${{ matrix.platform }} push: true tags: ${{ steps.meta.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 3c64964..0d53944 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,8 @@ RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposi && mkdir -p /pkgs/apk \ && echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \ && echo "permit nopass :abuild" >> /etc/doas.d/doas.conf \ - && adduser -D -G abuild builder && su builder -c 'abuild-keygen -a -n -i' + && adduser -D -G abuild builder \ + && su builder -c 'abuild-keygen -a -n -i' COPY alpine/ /src/testing/onnxruntime RUN chown -R builder /pkgs /src diff --git a/alpine/APKBUILD b/alpine/APKBUILD index e6a49af..e2852c5 100644 --- a/alpine/APKBUILD +++ b/alpine/APKBUILD @@ -45,14 +45,14 @@ options="net" # tests fail on arm 32 bit, see https://github.com/microsoft/onnxruntime/issues/16387 case "$CARCH" in -armhf|armv7) options="!check $options"; _extra_cxxflags="-Wno-overflow"; _extra_cflags="-flto=auto";; -ppc64le) _extra_cflags="-fno-lto";; -*) _extra_cflags="-flto=auto";; +armhf|armv7) options="!check $options"; _extra_cxxflags="-Wno-overflow -flto=auto"; _extra_cflags="-flto=auto";; +ppc64le) _extra_cxxflags="-fno-lto"; _extra_cflags="-fno-lto";; +*) _extra_cxxflags="-flto=auto"; _extra_cflags="-flto=auto";; esac build() { CFLAGS="$CFLAGS -O2 $_extra_cflags " \ - CXXFLAGS="$CXXFLAGS $_extra_cxxflags -O2 -Wno-deprecated-declarations -Wno-error=template-id-cdtor -flto=auto -U_FORTIFY_SOURCE -Wno-unused-variable -Wno-unused-parameter" \ + CXXFLAGS="$CXXFLAGS $_extra_cxxflags -O2 -Wno-deprecated-declarations -Wno-error=template-id-cdtor -U_FORTIFY_SOURCE -Wno-unused-variable -Wno-unused-parameter" \ LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" \ cmake -S cmake -B build -G Ninja -Wno-dev \ -DCMAKE_BUILD_TYPE=None \