Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 6 additions & 35 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,48 +213,17 @@ jobs:
executor: linux_arm64
steps:
- checkout
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need the same 'install docker' and 'setup_remote_docker' steps as x64?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It didn't have them before so I guess not? Not sure why.

- run:
name: check if emscripten-releases-tags.json has changed
command: |
CHANGED_FILES=$(git diff --name-only <<pipeline.git.base_revision>>..<<pipeline.git.revision>>)
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
Expand Down Expand Up @@ -341,7 +310,9 @@ workflows:
- publish-docker-image-arm64:
filters:
branches:
only: main
ignore: /.*/
tags:
only: /.*/
test-bazel-linux:
jobs:
- test-bazel-linux
Expand Down
2 changes: 1 addition & 1 deletion emscripten-releases-tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions emsdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]))
Expand Down
23 changes: 0 additions & 23 deletions scripts/update_linux_arm64.sh

This file was deleted.