diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 8fa635fe..d7277688 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -101,7 +101,7 @@ jobs: needs: init timeout-minutes: 360 env: - DOCKER_IMAGE: ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} + DOCKER_IMAGE: ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} strategy: fail-fast: false matrix: @@ -197,7 +197,7 @@ jobs: if: always() && needs.rank.result == 'success' timeout-minutes: 360 env: - DOCKER_IMAGE: ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} + DOCKER_IMAGE: ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} strategy: fail-fast: false matrix: @@ -306,7 +306,7 @@ jobs: env: JSZ_DATA_GITHUB_TOKEN: ${{ secrets.JSZ_DATA_GITHUB_TOKEN }} run: | - git clone --branch data --single-branch --depth 1 "https://x-access-token:${JSZ_DATA_GITHUB_TOKEN}@github.com/ivankra/javascript-zoo-data.git" data-repo + git clone --branch data --single-branch --depth 1 "https://x-access-token:${JSZ_DATA_GITHUB_TOKEN}@github.com/${{ github.repository_owner }}/javascript-zoo-data.git" data-repo cd data-repo for arch in amd64 arm64; do diff --git a/.github/workflows/build-qemu.yml b/.github/workflows/build-qemu.yml index 14775692..4f53b2c5 100644 --- a/.github/workflows/build-qemu.yml +++ b/.github/workflows/build-qemu.yml @@ -75,7 +75,7 @@ jobs: ref: ${{ github.sha }} - name: Build and push base toolchain images - run: DOCKER_PUSH=1 DOCKER_REGISTRY=ghcr.io/ivankra/javascript-zoo make -C build all + run: DOCKER_PUSH=1 DOCKER_REGISTRY=ghcr.io/${{ github.repository }} make -C build all engine: needs: [init, base] @@ -114,7 +114,7 @@ jobs: jerryscript|escargot) TARGET=dist-${{ matrix.engine }} ;; *) TARGET=dist ;; esac - DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/ivankra/javascript-zoo make -C engines/${{ matrix.engine }} $TARGET + DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/${{ github.repository }} make -C engines/${{ matrix.engine }} $TARGET - name: Package and upload to release run: | @@ -145,25 +145,25 @@ jobs: # Repack into -.tar for hub.Dockerfile (ADD auto-extracts it) tar --owner=root --group=root -cf ${DOCKER_ARCH}-${RELEASE_TAG}.tar ${DOCKER_ARCH} - - name: "Build and push ghcr.io/ivankra/javascript-zoo/jsz-runtime:${{ inputs.arch }}" + - name: "Build and push ghcr.io/${{ github.repository }}/jsz-runtime:${{ inputs.arch }}" run: | docker buildx build --platform linux/${DOCKER_ARCH} --push \ -f build/jsz-runtime.Dockerfile \ - -t ghcr.io/ivankra/javascript-zoo/jsz-runtime:${DOCKER_ARCH} \ + -t ghcr.io/${{ github.repository }}/jsz-runtime:${DOCKER_ARCH} \ --build-arg BASE=debian:stable \ . - - name: "Build and push ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }}" + - name: "Build and push ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }}" run: | docker buildx build --platform linux/${DOCKER_ARCH} --push \ -f build/hub.Dockerfile \ - -t ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} \ - --build-arg BASE=ghcr.io/ivankra/javascript-zoo/jsz-runtime:${DOCKER_ARCH} \ + -t ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} \ + --build-arg BASE=ghcr.io/${{ github.repository }}/jsz-runtime:${DOCKER_ARCH} \ --build-arg TAG=${{ needs.init.outputs.release_tag }} \ . - name: Smoke test run: | docker run --rm --platform linux/${DOCKER_ARCH} \ - ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} \ + ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} \ bash -c 'set -ex; while read f; do python3 /zoo/build/dist.py --smoke-test "/dist/$f"; done < /dist/LIST' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f20726a..c9ff87b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,8 +59,8 @@ jobs: # Build base toolchain images (build/jsz-*.Dockerfile) and push them to GHCR. # Images are tagged {name}:{arch}, e.g.: - # ghcr.io/ivankra/javascript-zoo/jsz-gcc:amd64 - # ghcr.io/ivankra/javascript-zoo/jsz-clang23:arm64 + # ghcr.io/${{ github.repository }}/jsz-gcc:amd64 + # ghcr.io/${{ github.repository }}/jsz-clang23:arm64 base: needs: init runs-on: ${{ matrix.runner }} @@ -79,7 +79,7 @@ jobs: ref: ${{ github.sha }} - name: Build and push base toolchain images - run: DOCKER_PUSH=1 DOCKER_REGISTRY=ghcr.io/ivankra/javascript-zoo make -C build all + run: DOCKER_PUSH=1 DOCKER_REGISTRY=ghcr.io/${{ github.repository }} make -C build all # Builder for amd64 binaries engine-amd64: @@ -114,7 +114,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 360 - command: DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/ivankra/javascript-zoo make -C engines/${{ matrix.engine }} dist + command: DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/${{ github.repository }} make -C engines/${{ matrix.engine }} dist - &upload_to_release name: Upload to release @@ -163,14 +163,14 @@ jobs: - *checkout - *ghcr_login - - name: Build and push ghcr.io/ivankra/javascript-zoo/hub - run: build/hub.sh ghcr.io/ivankra/javascript-zoo/hub ${{ needs.init.outputs.release_tag }} + - name: Build and push ghcr.io/${{ github.repository }}/hub + run: build/hub.sh ghcr.io/${{ github.repository }}/hub ${{ needs.init.outputs.release_tag }} - name: Log in to Docker Hub - run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u ivankra --password-stdin + run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u "${{ github.repository_owner }}" --password-stdin - - name: Build and push docker.io/ivankra/javascript-zoo - run: build/hub.sh docker.io/ivankra/javascript-zoo ${{ needs.init.outputs.release_tag }} + - name: Build and push docker.io/${{ github.repository }} + run: build/hub.sh docker.io/${{ github.repository }} ${{ needs.init.outputs.release_tag }} publish: needs: [init, hub] diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 53a9103e..152c2581 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -93,7 +93,7 @@ jobs: echo "conformance_shard_list=$(seq 1 "$N1" | jq -R 'tonumber' | jq -sc .)" | tee -a "$GITHUB_OUTPUT" # Build test262 engine list (one job per engine) - DOCKER_IMAGE="ghcr.io/ivankra/javascript-zoo/hub:$TAG" + DOCKER_IMAGE="ghcr.io/${{ github.repository }}/hub:$TAG" echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "$GITHUB_ACTOR" --password-stdin docker pull "$DOCKER_IMAGE" ALL_ENGINES="$(echo $SPECIAL_CONFIGS; docker run --rm "$DOCKER_IMAGE" cat /dist/LIST)" @@ -116,7 +116,7 @@ jobs: needs: init timeout-minutes: 360 env: - DOCKER_IMAGE: ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} + DOCKER_IMAGE: ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} SHARDS: ${{ needs.init.outputs.conformance_shards }} SHARD_PREFIX: conformance strategy: @@ -217,7 +217,7 @@ jobs: name: test262 (${{ matrix.engine }}) timeout-minutes: 360 env: - DOCKER_IMAGE: ghcr.io/ivankra/javascript-zoo/hub:${{ needs.init.outputs.release_tag }} + DOCKER_IMAGE: ghcr.io/${{ github.repository }}/hub:${{ needs.init.outputs.release_tag }} strategy: fail-fast: false matrix: @@ -313,7 +313,7 @@ jobs: env: JSZ_DATA_GITHUB_TOKEN: ${{ secrets.JSZ_DATA_GITHUB_TOKEN }} run: | - git clone --branch data --single-branch --depth 1 "https://x-access-token:${JSZ_DATA_GITHUB_TOKEN}@github.com/ivankra/javascript-zoo-data.git" data-repo + git clone --branch data --single-branch --depth 1 "https://x-access-token:${JSZ_DATA_GITHUB_TOKEN}@github.com/${{ github.repository_owner }}/javascript-zoo-data.git" data-repo cd data-repo for dir in es1-5 compat-table test262 test262/tags; do diff --git a/.github/workflows/hub.yml b/.github/workflows/hub.yml index 69ed9d52..8f1d176a 100644 --- a/.github/workflows/hub.yml +++ b/.github/workflows/hub.yml @@ -49,18 +49,18 @@ jobs: REV=$(gh release view "$TAG" --repo ${{ github.repository }} --json targetCommitish -q .targetCommitish) echo "rev=$REV" | tee -a "$GITHUB_OUTPUT" - - name: Build and push ghcr.io/ivankra/javascript-zoo/hub + - name: Build and push ghcr.io/${{ github.repository }}/hub env: REV: ${{ steps.tag.outputs.rev }} - run: build/hub.sh ghcr.io/ivankra/javascript-zoo/hub ${{ steps.tag.outputs.tag }} + run: build/hub.sh ghcr.io/${{ github.repository }}/hub ${{ steps.tag.outputs.tag }} - name: Log in to Docker Hub - run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u ivankra --password-stdin + run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u "${{ github.repository_owner }}" --password-stdin - - name: Build and push docker.io/ivankra/javascript-zoo + - name: Build and push docker.io/${{ github.repository }} env: REV: ${{ steps.tag.outputs.rev }} - run: build/hub.sh docker.io/ivankra/javascript-zoo ${{ steps.tag.outputs.tag }} + run: build/hub.sh docker.io/${{ github.repository }} ${{ steps.tag.outputs.tag }} - name: Publish release env: diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml index d5d2acba..e0afa1c7 100644 --- a/.github/workflows/rebuild.yml +++ b/.github/workflows/rebuild.yml @@ -101,7 +101,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 360 - command: DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/ivankra/javascript-zoo make -C engines/${{ matrix.engine }} dist + command: DIST_REMOVE_IMAGE=1 DOCKER_REGISTRY=ghcr.io/${{ github.repository }} make -C engines/${{ matrix.engine }} dist - name: Upload to release run: |