fix(ci): remove torii and katana from release and add dojoup

Author: glihm

.github/workflows/release-dispatch.yml

@@ -25,16 +25,12 @@ jobs:
           VERSION=${{ inputs.version }}
           VERSION=${VERSION#v}
           cargo release version $VERSION --execute --no-confirm && cargo release replace --execute --no-confirm
-      - id: version_info
-        run: |
-          cargo install cargo-get
-          echo "version=$(cargo get workspace.package.version)" >> $GITHUB_OUTPUT
       - uses: peter-evans/create-pull-request@v5
         with:
           # We have to use a PAT in order to trigger ci
           token: ${{ secrets.CREATE_PR_TOKEN }}
-          title: "Prepare release: v${{ steps.version_info.outputs.version }}"
-          commit-message: "Prepare release: v${{ steps.version_info.outputs.version }}"
+          title: "release(prepare): v${VERSION}"
+          commit-message: "Prepare release: v${VERSION}"
           branch: prepare-release
           base: main
           delete-branch: true

.github/workflows/release.yml

@@ -2,10 +2,6 @@ name: release
 
 on:
   workflow_dispatch:
-    inputs:
-      preview:
-        description: 'Preview tag if not empty. Needs to be in format vX.Y.Z-preview.X'
-        type: string
   pull_request:
     types: [closed]
     branches:
@@ -27,17 +23,8 @@ jobs:
       - name: Get version
         id: release_info
         run: |
-          if [[ "${{ github.event.inputs.preview || 'false' }}" != "false" ]]; then
-            # check if valid
-            if [[ ! "${{ github.event.inputs.preview }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-preview\.[0-9]+$ ]]; then
-              echo "Invalid preview tag format. Needs to be in format vX.Y.Z-preview.X"
-              exit 1
-            fi
-            echo "tag_name=${{ github.event.inputs.preview }}" >> $GITHUB_OUTPUT
-          else
-            cargo install cargo-get
-            echo "tag_name=v$(cargo get workspace.package.version)" >> $GITHUB_OUTPUT
-          fi
+          cargo install cargo-get
+          echo "tag_name=v$(cargo get workspace.package.version)" >> $GITHUB_OUTPUT
 
   release:
     name: ${{ matrix.job.target }} (${{ matrix.job.os }})
@@ -90,11 +77,6 @@ jobs:
         with:
           cache-on-failure: true
 
-      # Required to build Katana at the moment.
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-
       # required for `aws-lc-rs` crate to compile on Windows; https://aws.github.io/aws-lc-rs/requirements/windows.html
       - name: Install NASM
         uses: ilammy/setup-nasm@v1
@@ -130,16 +112,16 @@ jobs:
           VERSION_NAME: ${{ needs.prepare.outputs.tag_name }}
         run: |
           if [ "$PLATFORM_NAME" == "linux" ]; then
-            tar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii dojo-language-server
+            tar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release sozo dojo-language-server
             echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
           elif [ "$PLATFORM_NAME" == "darwin" ]; then
             # We need to use gtar here otherwise the archive is corrupt.
             # See: https://github.com/actions/virtual-environments/issues/2619
-            gtar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release katana sozo torii dojo-language-server
+            gtar -czvf "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" -C ./target/${TARGET}/release sozo dojo-language-server
             echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.tar.gz" >> $GITHUB_OUTPUT
           else
             cd ./target/${TARGET}/release
-            7z a -tzip "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" katana.exe sozo.exe torii.exe dojo-language-server.exe
+            7z a -tzip "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" sozo.exe dojo-language-server.exe
             mv "dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" ../../../
             echo "file_name=dojo_${VERSION_NAME}_${PLATFORM_NAME}_${ARCH}.zip" >> $GITHUB_OUTPUT
           fi
@@ -150,9 +132,7 @@ jobs:
         if: ${{ env.PLATFORM_NAME == 'linux' }}
         run: |
           mkdir -p $PLATFORM_NAME/$ARCH
-          mv target/$TARGET/release/katana $PLATFORM_NAME/$ARCH
           mv target/$TARGET/release/sozo $PLATFORM_NAME/$ARCH
-          mv target/$TARGET/release/torii $PLATFORM_NAME/$ARCH
         shell: bash
 
       # Upload these for use with the Docker build later

Dockerfile

@@ -31,6 +31,11 @@ LABEL description="Dojo is a provable game engine and toolchain for building onc
     source="https://github.com/dojoengine/dojo" \
     documentation="https://book.dojoengine.org/"
 
-COPY --from=artifacts --chmod=755 $TARGETPLATFORM/katana $TARGETPLATFORM/sozo $TARGETPLATFORM/torii /usr/local/bin/
+COPY --from=artifacts --chmod=755 $TARGETPLATFORM/sozo /usr/local/bin/
+
+# We may not want to install sozo via dojoup though, only Katana and Torii?
+# Or we can let the use decide.
+COPY dojoup/dojoup /usr/local/bin/dojoup
+# RUN dojoup -v $DOJO_VERSION
 
 COPY --from=builder /usr/local/bin/curtail /usr/local/bin/curtail