Print metadata

Kas-tle · Apr 16, 2024 · 563a3c9 · 563a3c9
1 parent 7ddfcea
commit 563a3c9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      PROJECT: 'geyser'
     steps:
       - name: Checkout repository and submodules
         # See https://github.com/actions/checkout/commits
@@ -102,6 +104,7 @@ jobs:
           ORG_GRADLE_PROJECT_geysermcPassword: ${{ secrets.DEPLOY_PASS }}
         with:
           arguments: publish
+
       - name: Get Release Metadata
         #if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
         uses: Kas-tle/base-release-action@664c39985eb9d0d393ce98e7eb8414d3d98e762a
@@ -118,6 +121,18 @@ jobs:
             viaproxy:bootstrap/viaproxy/build/libs/Geyser-ViaProxy.jar
           releaseEnabled: false
           saveMetadata: true
+      - name: Update Generated Metadata
+        #if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
+        run: |
+          cat metadata.json
+          echo
+          version=$(cat gradle.properties | grep -o "version=[0-9\\.]*" | cut -d"=" -f2)
+          cat metadata.json | jq -c --arg project "${PROJECT}" --arg version "${version}" '
+            .
+            | .changes |= map({"commit", "summary", "message"}) 
+            | .downloads |= map_values({"name", "sha256"})
+            | {$project, "repo", $version, "number": .build, "changes", "downloads"}
+          ' | tee metadata.json
       - name: Publish to Downloads API
         if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
         shell: bash
@@ -129,24 +144,13 @@ jobs:
           # Save the private key to a file
           echo "$DOWNLOADS_PRIVATE_KEY" > id_ecdsa
           chmod 600 id_ecdsa
-          # Set the project
-          project=geyser
-          # Get the version from gradle.properties
-          version=$(cat gradle.properties | grep -o "version=[0-9\\.]*" | cut -d"=" -f2)
           # Create the build folder
-          ssh -o StrictHostKeyChecking=no -i id_ecdsa $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP mkdir -p "~/uploads/$project/$GITHUB_RUN_NUMBER/"
+          ssh -o StrictHostKeyChecking=no -i id_ecdsa $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP mkdir -p "~/uploads/$PROJECT/$GITHUB_RUN_NUMBER/"
           # Copy over artifacts
-          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" bootstrap/**/build/libs/Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$project/$GITHUB_RUN_NUMBER/
-          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" bootstrap/mod/**/build/libs/Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$project/$GITHUB_RUN_NUMBER/
+          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" bootstrap/**/build/libs/Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$PROJECT/$GITHUB_RUN_NUMBER/
+          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" bootstrap/mod/**/build/libs/Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$PROJECT/$GITHUB_RUN_NUMBER/
           # Run the build script
-          # Push the metadata
-          jq -c --arg project "${project}" --arg version "${version}" '
-            .
-            | .changes |= map({"commit", "summary", "message"}) 
-            | .downloads |= map_values({"name", "sha256"})
-            | {$project, "repo", $version, "number": .build, "changes", "downloads"}
-          ' metadata.json > metadata.json.tmp && mv metadata.json.tmp metadata.json
-          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" metadata.json $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$project/$GITHUB_RUN_NUMBER/
+          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" metadata.json $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$PROJECT/$GITHUB_RUN_NUMBER/
 
       - name: Publish to Modrinth (Fabric)
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -3,7 +3,7 @@ name: Upload Preview
 on:
   workflow_dispatch:
     inputs:
-      runId:
+      build:
         required: true
         description: 'ID of the action to pull artifacts from'
       version:
@@ -13,10 +13,14 @@ on:
 jobs:
   upload:
     runs-on: ubuntu-latest
+    env:
+      PROJECT: 'geyser-preview'
+      BUILD: ${{ github.event.inputs.build }}
+      VERSION: ${{ github.event.inputs.version }}
     steps:
       - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427
         with:
-          run-id: ${{ github.event.inputs.runId }}
+          run-id: ${{ github.event.inputs.build }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           merge-multiple: true
       - name: 'List Artifacts'
@@ -39,38 +43,31 @@ jobs:
           releaseEnabled: false
           saveMetadata: true
           updateReleaseData: false
-      - run: |
+      - name: Update Generated Metadata
+        #if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
+        run: |
           cat metadata.json
           echo
-          jq --arg project "geyser-preview" --arg version "pr.${{ github.event.inputs.version }}" --arg number "${{ github.event.inputs.runId }}" '
+          cat metadata.json | jq --arg project "${PROJECT}" --arg version "${VERSION}" --arg number "${BUILD}" '
             .
             | .downloads |= map_values({"name", "sha256"})
             | {$project, "repo", $version, "number": $number | tonumber, "changes": [], "downloads"}
-          ' metadata.json
+          ' | tee metadata.json
       - name: Publish to Downloads API
         if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
         shell: bash
         env:
           DOWNLOADS_USERNAME: ${{ vars.DOWNLOADS_USERNAME }}
           DOWNLOADS_PRIVATE_KEY: ${{ secrets.DOWNLOADS_PRIVATE_KEY }}
           DOWNLOADS_SERVER_IP: ${{ secrets.DOWNLOADS_SERVER_IP }}
-          RUN_ID: ${{ github.event.inputs.runId }}
-          VERSION: ${{ github.event.inputs.version }}
         run: |
           # Save the private key to a file
           echo "$DOWNLOADS_PRIVATE_KEY" > id_ecdsa
           chmod 600 id_ecdsa
-          # Set the project
-          project=geyser-preview
           # Create the build folder
-          ssh -o StrictHostKeyChecking=no -i id_ecdsa $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP mkdir -p "~/uploads/$project/$RUN_ID/"
+          ssh -o StrictHostKeyChecking=no -i id_ecdsa $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP mkdir -p "~/uploads/$PROJECT/$BUILD/"
           # Copy over artifacts
-          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$project/$RUN_ID/
+          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" Geyser-*.jar $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$PROJECT/$BUILD/
           # Run the build script
           # Push the metadata
-          jq -c --arg project "${project}" --arg version "${VERSION}" --arg number "${RUN_ID}" '
-            .
-            | .downloads |= map_values({"name", "sha256"})
-            | {$project, "repo", $version, "number": $number | tonumber, "changes": [], "downloads"}
-          ' metadata.json > metadata.json.tmp && mv metadata.json.tmp metadata.json
-          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" metadata.json $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$project/$RUN_ID/
+          rsync -P -e "ssh -o StrictHostKeyChecking=no -i id_ecdsa" metadata.json $DOWNLOADS_USERNAME@$DOWNLOADS_SERVER_IP:~/uploads/$PROJECT/$BUILD/
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -102,19 +102,21 @@ jobs:
           name: Geyser ViaProxy
           path: geyser/bootstrap/viaproxy/build/libs/Geyser-ViaProxy.jar
           if-no-files-found: error
+
       - name: Trigger Preview Deployment
         if: >-
           contains(github.event.pull_request.labels.*.name, 'PR: Needs Testing')
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
         with:
           script: |
+            const 
             github.rest.actions.createWorkflowDispatch({
               owner: context.repo.owner,
               repo: context.repo.repo,
               workflow_id: 'preview.yml',
               ref: 'actions-testing',
               inputs: {
-                runId: '${{ github.run_id }}',
+                build: '${{ github.run_number }}',
                 version: 'pr.${{ github.event.pull_request.number }}'
               }
             });