Skip to content

Commit 176dec4

Browse files
authored
arm64-linux binaries are now available for all releases (#1369)
1 parent 229d83f commit 176dec4

File tree

4 files changed

+7
-62
lines changed

4 files changed

+7
-62
lines changed

.circleci/config.yml

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -213,48 +213,17 @@ jobs:
213213
executor: linux_arm64
214214
steps:
215215
- checkout
216-
- run:
217-
name: check if emscripten-releases-tags.json has changed
218-
command: |
219-
CHANGED_FILES=$(git diff --name-only <<pipeline.git.base_revision>>..<<pipeline.git.revision>>)
220-
if [[ ! $CHANGED_FILES =~ "emscripten-releases-tags.json" ]]; then
221-
echo "emscripten-releases-tags.json has not changed, skipping build and publish"
222-
circleci-agent step halt
223-
fi
224-
- run:
225-
name: extract latest emscripten arm64 linux version
226-
command: |
227-
ARM64_VERSION=$(grep -oP '(?<="latest-arm64-linux": ")[^"]*' emscripten-releases-tags.json)
228-
ARM64_IMAGE_TAG=${ARM64_VERSION}-arm64
229-
echo "export ARM64_VERSION=$ARM64_VERSION" >> $BASH_ENV
230-
echo "export ARM64_IMAGE_TAG=$ARM64_IMAGE_TAG" >> $BASH_ENV
231-
echo "ARM64_VERSION=$ARM64_VERSION"
232-
echo "ARM64_IMAGE_TAG=$ARM64_IMAGE_TAG"
233-
- run:
234-
name: check if docker image already exists
235-
command: |
236-
if [ -z "$ARM64_VERSION" ]; then
237-
echo "ARM64_VERSION is empty, skipping publish"
238-
circleci-agent step halt
239-
exit 0
240-
fi
241-
DOCKER_IMAGE_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" https://hub.docker.com/v2/repositories/emscripten/emsdk/tags/$ARM64_IMAGE_TAG)
242-
if [ "$DOCKER_IMAGE_EXISTS" = "200" ]; then
243-
echo "Docker image: $ARM64_VERSION"
244-
echo "Docker image already exists, skipping build and publish"
245-
circleci-agent step halt
246-
fi
247216
- run:
248217
name: build
249-
command: make -C ./docker version=${ARM64_VERSION} build
218+
command: make -C ./docker version=${CIRCLE_TAG} build
250219
- run:
251220
name: test
252-
command: make -C ./docker version=${ARM64_VERSION} test
221+
command: make -C ./docker version=${CIRCLE_TAG} test
253222
- run:
254223
name: push image
255224
command: |
256225
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
257-
make -C ./docker version=${ARM64_VERSION} alias=${ARM64_IMAGE_TAG} only_alias=true push
226+
make -C ./docker version=${CIRCLE_TAG} alias=${CIRCLE_TAG}-arm64 only_alias=true push
258227
259228
test-bazel-linux:
260229
executor: bionic
@@ -341,7 +310,9 @@ workflows:
341310
- publish-docker-image-arm64:
342311
filters:
343312
branches:
344-
only: main
313+
ignore: /.*/
314+
tags:
315+
only: /.*/
345316
test-bazel-linux:
346317
jobs:
347318
- test-bazel-linux

emscripten-releases-tags.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"aliases": {
33
"latest": "3.1.57",
44
"latest-sdk": "latest",
5-
"latest-arm64-linux": "3.1.47",
5+
"latest-arm64-linux": "latest",
66
"latest-64bit": "latest",
77
"sdk-latest-64bit": "latest",
88
"latest-upstream": "latest",

emsdk.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,9 +2040,6 @@ def find_latest_hash():
20402040

20412041
def resolve_sdk_aliases(name, verbose=False):
20422042
releases_info = load_releases_info()
2043-
if name == 'latest' and LINUX and ARCH == 'arm64':
2044-
errlog("WARNING: 'latest' on arm64-linux may be slightly behind other architectures")
2045-
name = 'latest-arm64-linux'
20462043
while name in releases_info['aliases']:
20472044
if verbose:
20482045
print("Resolving SDK alias '%s' to '%s'" % (name, releases_info['aliases'][name]))

scripts/update_linux_arm64.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)