From d20f7a96f3951a43dc90bb8aa5939af0052e83f7 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 10 Apr 2024 13:30:44 -0700 Subject: [PATCH] arm64-linux binaries are now available for all releases --- .circleci/config.yml | 41 +++++------------------------------ emscripten-releases-tags.json | 2 +- emsdk.py | 3 --- scripts/update_linux_arm64.sh | 23 -------------------- 4 files changed, 7 insertions(+), 62 deletions(-) delete mode 100755 scripts/update_linux_arm64.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 281f32f19b..cea7e0e37b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -213,48 +213,17 @@ jobs: executor: linux_arm64 steps: - checkout - - run: - name: check if emscripten-releases-tags.json has changed - command: | - CHANGED_FILES=$(git diff --name-only <>..<>) - if [[ ! $CHANGED_FILES =~ "emscripten-releases-tags.json" ]]; then - echo "emscripten-releases-tags.json has not changed, skipping build and publish" - circleci-agent step halt - fi - - run: - name: extract latest emscripten arm64 linux version - command: | - ARM64_VERSION=$(grep -oP '(?<="latest-arm64-linux": ")[^"]*' emscripten-releases-tags.json) - ARM64_IMAGE_TAG=${ARM64_VERSION}-arm64 - echo "export ARM64_VERSION=$ARM64_VERSION" >> $BASH_ENV - echo "export ARM64_IMAGE_TAG=$ARM64_IMAGE_TAG" >> $BASH_ENV - echo "ARM64_VERSION=$ARM64_VERSION" - echo "ARM64_IMAGE_TAG=$ARM64_IMAGE_TAG" - - run: - name: check if docker image already exists - command: | - if [ -z "$ARM64_VERSION" ]; then - echo "ARM64_VERSION is empty, skipping publish" - circleci-agent step halt - exit 0 - fi - DOCKER_IMAGE_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" https://hub.docker.com/v2/repositories/emscripten/emsdk/tags/$ARM64_IMAGE_TAG) - if [ "$DOCKER_IMAGE_EXISTS" = "200" ]; then - echo "Docker image: $ARM64_VERSION" - echo "Docker image already exists, skipping build and publish" - circleci-agent step halt - fi - run: name: build - command: make -C ./docker version=${ARM64_VERSION} build + command: make -C ./docker version=${CIRCLE_TAG} build - run: name: test - command: make -C ./docker version=${ARM64_VERSION} test + command: make -C ./docker version=${CIRCLE_TAG} test - run: name: push image command: | docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" - make -C ./docker version=${ARM64_VERSION} alias=${ARM64_IMAGE_TAG} only_alias=true push + make -C ./docker version=${CIRCLE_TAG} alias=${CIRCLE_TAG}-arm64 only_alias=true push test-bazel-linux: executor: bionic @@ -341,7 +310,9 @@ workflows: - publish-docker-image-arm64: filters: branches: - only: main + ignore: /.*/ + tags: + only: /.*/ test-bazel-linux: jobs: - test-bazel-linux diff --git a/emscripten-releases-tags.json b/emscripten-releases-tags.json index 5885520409..51e9104eab 100644 --- a/emscripten-releases-tags.json +++ b/emscripten-releases-tags.json @@ -2,7 +2,7 @@ "aliases": { "latest": "3.1.57", "latest-sdk": "latest", - "latest-arm64-linux": "3.1.47", + "latest-arm64-linux": "latest", "latest-64bit": "latest", "sdk-latest-64bit": "latest", "latest-upstream": "latest", diff --git a/emsdk.py b/emsdk.py index 1983287830..9eccfb5693 100644 --- a/emsdk.py +++ b/emsdk.py @@ -2040,9 +2040,6 @@ def find_latest_hash(): def resolve_sdk_aliases(name, verbose=False): releases_info = load_releases_info() - if name == 'latest' and LINUX and ARCH == 'arm64': - errlog("WARNING: 'latest' on arm64-linux may be slightly behind other architectures") - name = 'latest-arm64-linux' while name in releases_info['aliases']: if verbose: print("Resolving SDK alias '%s' to '%s'" % (name, releases_info['aliases'][name])) diff --git a/scripts/update_linux_arm64.sh b/scripts/update_linux_arm64.sh deleted file mode 100755 index 097700c751..0000000000 --- a/scripts/update_linux_arm64.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Script for updating the linux-arm64 release -# -# Takes as stdin the JSON string generated by the S3 bucket update when -# amazon produces a new build. e.g. -# {"Records":[{"eventVersion":"2.1","eventSource":"aws:s3","awsRegion":"us-west-2","eventTime":"2023-08-23T19:12:29.218Z","eventName":"ObjectCreated:CompleteMultipartUpload","userIdentity":{"principalId":"AWS:AROAZNAVTCTIWSHR6WFTE:i-0124c978819146a2f"},"requestParameters":{"sourceIPAddress":"35.90.239.236"},"responseElements":{"x-amz-request-id":"3SDMWYMG4BN47DCD","x-amz-id-2":"0mRaqwIIZI8ob1B7TmTSd/s0lXxST73ktgGm94MjKj2bnflqD1zCjbh2LeMIYYPvvfgQu0Ocrlev4nYmiOmS9wR0M/lvpCQz"},"s3":{"s3SchemaVersion":"1.0","configurationId":"arn:aws:cloudformation:us-west-2:646437868753:stack/EmscriptenArm64BuilderStack/eb5d5760-ee9a-11ec-a790-06738944b93b--3752220361625282518","bucket":{"name":"emscripten-arm64-4484191c","ownerIdentity":{"principalId":"A2IEUDOSUKZVHO"},"arn":"arn:aws:s3:::emscripten-arm64-4484191c"},"object":{"key":"emscripten-install-3.1.45-linux-arm64.tbz2","size":247058408,"eTag":"bb7f6835c7900deee6e7881a352ab48c-30","sequencer":"0064E65A1BC2C23A2E"}}}]} - -set -e - -if [ $# -ne 1 ]; then - echo "Please specify a single argument which is an emsdk version (e.g. 3.1.45)" - exit -fi - -VERSION=$1 -SHA=$(jq -r ".releases.\"${VERSION}\"" emscripten-releases-tags.json) -URL=$(jq -r '.Records[0] | "https://\(.s3.bucket.name).s3.\(.awsRegion).amazonaws.com/\(.s3.object.key)"') - -wget $URL -O arm64.tar.xz -gsutil cp -n arm64.tar.xz gs://webassembly/emscripten-releases-builds/linux/${SHA}/wasm-binaries-arm64.tar.xz -sed -i "s/\"latest-arm64-linux\": \".*\"/\"latest-arm64-linux\": \"$VERSION\"/" emscripten-releases-tags.json - -echo "done"