Skip to content

Commit ba93f9a

Browse files
authored
fix: reenable arm64 build (#3626)
### Summary Reverts the CI change in #3624 and reenables the `arm64` build and publish steps.
1 parent 8b7e5bb commit ba93f9a

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.github/workflows/docker-publish.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
build-images:
2525
strategy:
2626
matrix:
27-
# NOTE(robinson) - temporarily disabling linux/arm64. Build is currently failing
28-
# due to broken mesa-gl package. Still need an arm build for the working version.
29-
docker-platform: ["linux/amd64"]
27+
docker-platform: ["linux/arm64", "linux/amd64"]
3028
runs-on: ubuntu-latest-m
3129
needs: set-short-sha
3230
env:
@@ -95,22 +93,22 @@ jobs:
9593
- name: Pull AMD image
9694
run: |
9795
docker pull $DOCKER_BUILD_REPOSITORY:amd64-$SHORT_SHA
98-
# - name: Pull ARM image
99-
# run: |
100-
# docker pull $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA
96+
- name: Pull ARM image
97+
run: |
98+
docker pull $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA
10199
- name: Push latest build tags for AMD and ARM
102100
run: |
103101
# these are used to construct the final manifest but also cache-from in subsequent runs
104102
docker tag $DOCKER_BUILD_REPOSITORY:amd64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64
105103
docker push $DOCKER_BUILD_REPOSITORY:amd64
106-
# docker tag $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:arm64
107-
# docker push $DOCKER_BUILD_REPOSITORY:arm64
104+
docker tag $DOCKER_BUILD_REPOSITORY:arm64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:arm64
105+
docker push $DOCKER_BUILD_REPOSITORY:arm64
108106
- name: Push multiarch manifest
109107
run: |
110-
docker manifest create ${DOCKER_REPOSITORY}:latest $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64
108+
docker manifest create ${DOCKER_REPOSITORY}:latest $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64
111109
docker manifest push $DOCKER_REPOSITORY:latest
112-
docker manifest create ${DOCKER_REPOSITORY}:$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64
110+
docker manifest create ${DOCKER_REPOSITORY}:$SHORT_SHA $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64
113111
docker manifest push $DOCKER_REPOSITORY:$SHORT_SHA
114112
VERSION=$(grep -Po '(?<=__version__ = ")[^"]*' unstructured/__version__.py)
115-
docker manifest create ${DOCKER_REPOSITORY}:$VERSION $DOCKER_BUILD_REPOSITORY:amd64 # $DOCKER_BUILD_REPOSITORY:arm64
113+
docker manifest create ${DOCKER_REPOSITORY}:$VERSION $DOCKER_BUILD_REPOSITORY:amd64 $DOCKER_BUILD_REPOSITORY:arm64
116114
docker manifest push $DOCKER_REPOSITORY:$VERSION

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 0.15.13-dev0
2+
3+
### Enhancements
4+
5+
### Features
6+
7+
### Fixes
8+
19
## 0.15.12
210

311
### Enhancements

unstructured/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.15.12" # pragma: no cover
1+
__version__ = "0.15.13-dev0" # pragma: no cover

0 commit comments

Comments
 (0)