build: remove unused version input

robalyx · Feb 1, 2025 · bd79dc0 · bd79dc0
1 parent fb8840f
commit bd79dc0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,10 +1,6 @@
 name: Release
 on:
   workflow_dispatch:
-    inputs:
-      version:
-        description: 'Export version'
-        required: true
 
 jobs:
   create-release:
@@ -21,11 +17,13 @@ jobs:
       - name: Install UPX
         run: sudo apt-get update && sudo apt-get install -y upx-ucl
 
-      - name: Get Engine Version
-        id: get_version
+      - name: Get Versions
+        id: get_versions
         run: |
           ENGINE_VERSION=$(jq -r '.engineVersion' exports/official/export_config.json)
+          EXPORT_VERSION=$(jq -r '.exportVersion' exports/official/export_config.json)
           echo "ENGINE_VERSION=$ENGINE_VERSION" >> $GITHUB_ENV
+          echo "EXPORT_VERSION=$EXPORT_VERSION" >> $GITHUB_ENV
 
       - name: Build
         run: |
@@ -46,4 +44,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           chmod +x ./scripts/create_release.sh
-          ./scripts/create_release.sh "${{ secrets.GITHUB_TOKEN }}" 
+          ./scripts/create_release.sh "${{ secrets.GITHUB_TOKEN }}" "${{ env.ENGINE_VERSION }}" "${{ env.EXPORT_VERSION }}" 
diff --git a/exports/official/export_config.json b/exports/official/export_config.json
@@ -1,6 +1,6 @@
 {
     "engineVersion": "1.0.0",
-    "exportVersion": "1.0.0",
+    "exportVersion": "0.1.0",
     "salt": "r0t3ct0r_s4lt_f0r_3xp0rt5_2025_1738205981",
     "description": "Official Export from a 1 hour test run",
     "hashType": "argon2id",

diff --git a/scripts/create_release.sh b/scripts/create_release.sh
@@ -6,16 +6,8 @@ REPO_OWNER="robalyx"
 REPO_NAME="rotten"
 EXPORT_DIR="exports/official"
 GITHUB_TOKEN="$1"
-
-# Read version from export config
-ENGINE_VERSION=$(jq -r '.engineVersion' "$EXPORT_DIR/export_config.json")
-EXPORT_VERSION=$(jq -r '.exportVersion' "$EXPORT_DIR/export_config.json")
-
-if [ -z "$EXPORT_VERSION" ] || [ -z "$ENGINE_VERSION" ]; then
-    echo "Error: Failed to read version from export config"
-    exit 1
-fi
-
+ENGINE_VERSION="$2"
+EXPORT_VERSION="$3"
 
 # Create export zip file
 EXPORT_ZIP="export-${EXPORT_VERSION}.zip"