From 8b7e5bbeac17f6a782a629538f7108da3e9f4fbf Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Fri, 13 Sep 2024 09:47:39 -0400 Subject: [PATCH] fix: temporarily disable arm64 build (#3624) ### Summary Per [this job](https://github.com/Unstructured-IO/unstructured/actions/runs/10842120429/job/30087252047), `arm64` builds are currently failing, likely because the workaround for the broken `mesa-gl` package from the `wolfi` repository only works for `amd64`. Temporarily disabling the `arm64` build in order to push out the latest `amd64` image with security patches, then will revert and work the fix for the `arm64` image. - https://github.com/Unstructured-IO/base-images/pull/44 --- .github/workflows/docker-publish.yml | 20 +++++++++++--------- CHANGELOG.md | 2 +- unstructured/__version__.py | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8705bb39b8..0eea6bccfa 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,7 +24,9 @@ jobs: build-images: strategy: matrix: - docker-platform: ["linux/arm64", "linux/amd64"] + # NOTE(robinson) - temporarily disabling linux/arm64. Build is currently failing + # due to broken mesa-gl package. Still need an arm build for the working version. + docker-platform: ["linux/amd64"] runs-on: ubuntu-latest-m needs: set-short-sha env: @@ -93,22 +95,22 @@ jobs: - name: Pull AMD image run: | docker pull $DOCKER_BUILD_REPOSITORY:amd64-$SHORT_SHA - - name: Pull ARM image - run: | - docker pull $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA + # - name: Pull ARM image + # run: | + # docker pull $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA - name: Push latest build tags for AMD and ARM run: | # these are used to construct the final manifest but also cache-from in subsequent runs docker tag $DOCKER_BUILD_REPOSITORY:amd64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64 docker push $DOCKER_BUILD_REPOSITORY:amd64 - docker tag $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:arm64 - docker push $DOCKER_BUILD_REPOSITORY:arm64 + # docker tag $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:arm64 + # docker push $DOCKER_BUILD_REPOSITORY:arm64 - name: Push multiarch manifest run: | - docker manifest create ${DOCKER_REPOSITORY}:latest $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64 + docker manifest create ${DOCKER_REPOSITORY}:latest $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64 docker manifest push $DOCKER_REPOSITORY:latest - docker manifest create ${DOCKER_REPOSITORY}:$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64 + docker manifest create ${DOCKER_REPOSITORY}:$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64 docker manifest push $DOCKER_REPOSITORY:$SHORT_SHA VERSION=$(grep -Po '(?<=__version__ = ")[^"]*' unstructured/__version__.py) - docker manifest create ${DOCKER_REPOSITORY}:$VERSION $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64 + docker manifest create ${DOCKER_REPOSITORY}:$VERSION $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64 docker manifest push $DOCKER_REPOSITORY:$VERSION diff --git a/CHANGELOG.md b/CHANGELOG.md index 49e3878a0e..68058f00e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.15.12-dev2 +## 0.15.12 ### Enhancements diff --git a/unstructured/__version__.py b/unstructured/__version__.py index 782ceee513..e6985bc5ed 100644 --- a/unstructured/__version__.py +++ b/unstructured/__version__.py @@ -1 +1 @@ -__version__ = "0.15.12-dev2" # pragma: no cover +__version__ = "0.15.12" # pragma: no cover