From 191499929b5bd5d2fbccfcd9f5f11dd2c740d732 Mon Sep 17 00:00:00 2001 From: Tarrence van As Date: Sun, 26 Nov 2023 13:45:24 -0500 Subject: [PATCH] Fix artifact path in release script --- .github/workflows/release.yml | 10 +++++----- Dockerfile | 14 ++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df726fb4bd..9ec848f425 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -191,10 +191,10 @@ jobs: body: ${{ needs.prepare.outputs.changelog }} files: | ${{ steps.artifacts.outputs.file_name }} - + # Upload these for use with the Docker build later - name: Upload binaries - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: binaries path: | @@ -241,10 +241,10 @@ jobs: uses: actions/checkout@v2 - name: Download binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: binaries - path: target/ + path: artifacts - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -279,7 +279,7 @@ jobs: uses: actions/download-artifact@v2 with: name: binaries - path: target/ + path: artifacts - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/Dockerfile b/Dockerfile index 685091562d..3ee11c5740 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,13 @@ LABEL description="Dojo is a provable game engine and toolchain for building onc documentation="https://book.dojoengine.org/" FROM base as amd64 -COPY target/x86_64-unknown-linux-gnu/release/katana /usr/local/bin/katana -COPY target/x86_64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo -COPY target/x86_64-unknown-linux-gnu/release/torii /usr/local/bin/torii +RUN ls -R +COPY artifacts/target/x86_64-unknown-linux-gnu/release/katana /usr/local/bin/katana +COPY artifacts/target/x86_64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo +COPY artifacts/target/x86_64-unknown-linux-gnu/release/torii /usr/local/bin/torii FROM base as arm64 -COPY target/aarch64-unknown-linux-gnu/release/katana /usr/local/bin/katana -COPY target/aarch64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo -COPY target/aarch64-unknown-linux-gnu/release/torii /usr/local/bin/torii +RUN ls -R +COPY artifacts/target/aarch64-unknown-linux-gnu/release/katana /usr/local/bin/katana +COPY artifacts/target/aarch64-unknown-linux-gnu/release/sozo /usr/local/bin/sozo +COPY artifacts/target/aarch64-unknown-linux-gnu/release/torii /usr/local/bin/torii