[ci] fix scramjet utils consistently

Author: Percslol

.github/workflows/main.yml

@@ -36,15 +36,15 @@ jobs:
       controller_version_changed: ${{ steps.check-scramjet-controller.outputs.version_changed }}
       controller_new_version: ${{ steps.check-scramjet-controller.outputs.new_version }}
       controller_tag_arg: ${{ steps.check-scramjet-controller.outputs.tag_arg }}
+      utils_version_changed: ${{ steps.check-scramjet-utils.outputs.version_changed }}
+      utils_new_version: ${{ steps.check-scramjet-utils.outputs.new_version }}
+      utils_tag_arg: ${{ steps.check-scramjet-utils.outputs.tag_arg }}
       bootstrap_version_changed: ${{ steps.check-bootstrap.outputs.version_changed }}
       bootstrap_new_version: ${{ steps.check-bootstrap.outputs.new_version }}
       bootstrap_tag_arg: ${{ steps.check-bootstrap.outputs.tag_arg }}
       create_proxy_app_version_changed: ${{ steps.check-create-proxy-app.outputs.version_changed }}
       create_proxy_app_new_version: ${{ steps.check-create-proxy-app.outputs.new_version }}
       create_proxy_app_tag_arg: ${{ steps.check-create-proxy-app.outputs.tag_arg }}
-      utils_version_changed: ${{ steps.check-scramjet-utils.outputs.version_changed }}
-      utils_new_version: ${{ steps.check-scramjet-utils.outputs.new_version }}
-      utils_tag_arg: ${{ steps.check-scramjet-utils.outputs.tag_arg }}
 
     steps:
       - name: Checkout Code
@@ -92,12 +92,12 @@ jobs:
             echo "version_changed=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Check the version (proxy-bootstrap)
-        id: check-bootstrap
+      - name: Check the version (scramjet/utils)
+        id: check-scramjet-utils
         run: |
-          CURRENT_VERSION=$(jq -r .version packages/bootstrap/package.json)
+          CURRENT_VERSION=$(jq -r .version packages/utils/package.json)
           echo "Current version: $CURRENT_VERSION"
-          LATEST_VERSION=$(npm view @mercuryworkshop/proxy-bootstrap versions --json | jq -r '.[-1]' || echo "0.0.0")
+          LATEST_VERSION=$(npm view @mercuryworkshop/scramjet-utils versions --json | jq -r '.[-1]' || echo "0.0.0")
           echo "Latest NPM version: $LATEST_VERSION"
 
           if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ];
@@ -113,12 +113,12 @@ jobs:
             echo "version_changed=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Check the version (create-proxy-app)
-        id: check-create-proxy-app
+      - name: Check the version (proxy-bootstrap)
+        id: check-bootstrap
         run: |
-          CURRENT_VERSION=$(jq -r .version packages/create-proxy-app/package.json)
+          CURRENT_VERSION=$(jq -r .version packages/bootstrap/package.json)
           echo "Current version: $CURRENT_VERSION"
-          LATEST_VERSION=$(npm view create-proxy-app versions --json | jq -r '.[-1]' || echo "0.0.0")
+          LATEST_VERSION=$(npm view @mercuryworkshop/proxy-bootstrap versions --json | jq -r '.[-1]' || echo "0.0.0")
           echo "Latest NPM version: $LATEST_VERSION"
 
           if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ];
@@ -134,12 +134,12 @@ jobs:
             echo "version_changed=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Check the version (scramjet-utils)
-        id: check-scramjet-utils
+      - name: Check the version (create-proxy-app)
+        id: check-create-proxy-app
         run: |
-          CURRENT_VERSION=$(jq -r .version packages/utils/package.json)
+          CURRENT_VERSION=$(jq -r .version packages/create-proxy-app/package.json)
           echo "Current version: $CURRENT_VERSION"
-          LATEST_VERSION=$(npm view @mercuryworkshop/scramjet-utils versions --json | jq -r '.[-1]' || echo "0.0.0")
+          LATEST_VERSION=$(npm view create-proxy-app versions --json | jq -r '.[-1]' || echo "0.0.0")
           echo "Latest NPM version: $LATEST_VERSION"
 
           if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ];
@@ -225,6 +225,18 @@ jobs:
         with:
           name: scramjet-controller-package
           path: packages/controller/mercuryworkshop-scramjet-controller-*.tgz
+      
+      - name: Upload Artifact (scramjet/utils)
+        uses: actions/upload-artifact@v4
+        with:
+          name: scramjet-utils
+          path: packages/utils/dist/*
+
+      - name: Upload Artifact (scramjet/utils) (packaged)
+        uses: actions/upload-artifact@v4
+        with:
+          name: scramjet-utils-package
+          path: packages/utils/mercuryworkshop-scramjet-utils-*.tgz
 
       - name: Upload Artifact (proxy-bootstrap) (packaged)
         uses: actions/upload-artifact@v4
@@ -238,18 +250,6 @@ jobs:
           name: create-proxy-app-package
           path: packages/create-proxy-app/create-proxy-app-*.tgz
 
-      - name: Upload Artifact (scramjet-utils)
-        uses: actions/upload-artifact@v4
-        with:
-          name: scramjet-utils
-          path: packages/utils/dist/*
-
-      - name: Upload Artifact (scramjet-utils) (packaged)
-        uses: actions/upload-artifact@v4
-        with:
-          name: scramjet-utils-package
-          path: packages/utils/mercuryworkshop-scramjet-utils-*.tgz
-
   package-validation:
     name: Validate Package Structure
     runs-on: ubuntu-latest
@@ -340,7 +340,7 @@ jobs:
         working-directory: packages/runway
 
   rewritertests:
-    name: "Run Rewriter Tests"
+    name: Run Rewriter Tests
     runs-on: ubuntu-latest
     needs: [build, package-validation]
 
@@ -449,6 +449,13 @@ jobs:
           name: scramjet-controller-package
           path: .
 
+      - name: Get artifacts (scramjet/utils)
+        if: needs.version-check.outputs.utils_version_changed == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: scramjet-utils-package
+          path: .
+      
       - name: Get artifacts (proxy-bootstrap)
         if: needs.version-check.outputs.bootstrap_version_changed == 'true'
         uses: actions/download-artifact@v4
@@ -463,13 +470,6 @@ jobs:
           name: create-proxy-app-package
           path: .
 
-      - name: Get artifacts (scramjet-utils)
-        if: needs.version-check.outputs.utils_version_changed == 'true'
-        uses: actions/download-artifact@v4
-        with:
-          name: scramjet-utils-package
-          path: .
-
       - name: Publish Scramjet
         if: needs.version-check.outputs.scramjet_version_changed == 'true'
         run: pnpm publish mercuryworkshop-scramjet-${{ needs.version-check.outputs.scramjet_new_version }}.tgz --access public --provenance ${{ needs.version-check.outputs.scramjet_tag_arg }}