Only specify the PC version twice, in the Makefile and build.yml

Rangi42 · Feb 19, 2025 · 962d6ce · 962d6ce
1 parent 18bac49
commit 962d6ce
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,8 @@ on:
   workflow_call:
 
 env:
+  # PC_VERSION should match VERSION in Makefile
+  PC_VERSION: "3.2.0"
   RGBDS_VERSION: "v0.9.0"
 
 jobs:
@@ -55,70 +57,70 @@ jobs:
         run: |
           make -j$(nproc)
           mkdir build
-          mv polishedcrystal-3.2.0.gbc build/polishedcrystal-dev-${{ env.SHORT_SHA }}.gbc
-          mv polishedcrystal-3.2.0.sym build/polishedcrystal-dev-${{ env.SHORT_SHA }}.sym
+          mv polishedcrystal-${{ env.PC_VERSION }}.gbc build/polishedcrystal-dev-${{ env.SHORT_SHA }}.gbc
+          mv polishedcrystal-${{ env.PC_VERSION }}.sym build/polishedcrystal-dev-${{ env.SHORT_SHA }}.sym
           make tidy
 
       - id: build-polishedcrystal-faithful
         name: "Build polishedcrystal-faithful"
         run: |
           make -j$(nproc) faithful
-          mv polishedcrystal-faithful-3.2.0.gbc build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.gbc
-          mv polishedcrystal-faithful-3.2.0.sym build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.sym
+          mv polishedcrystal-faithful-${{ env.PC_VERSION }}.gbc build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.gbc
+          mv polishedcrystal-faithful-${{ env.PC_VERSION }}.sym build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.sym
           make tidy
 
       # BUILD VC PATCHES
       - id: build-polishedcrystal-vc
         name: "Build polishedcrystal vc"
         run: |
           make -j$(nproc) vc
-          mv polishedcrystal-3.2.0_vc.gbc build/polishedcrystal-dev-${{ env.SHORT_SHA }}_vc.gbc
-          mv polishedcrystal-3.2.0.patch build/polishedcrystal-dev-${{ env.SHORT_SHA }}.patch
-          mv polishedcrystal-3.2.0_vc.sym build/polishedcrystal-dev-${{ env.SHORT_SHA }}_vc.sym
+          mv polishedcrystal-${{ env.PC_VERSION }}_vc.gbc build/polishedcrystal-dev-${{ env.SHORT_SHA }}_vc.gbc
+          mv polishedcrystal-${{ env.PC_VERSION }}.patch build/polishedcrystal-dev-${{ env.SHORT_SHA }}.patch
+          mv polishedcrystal-${{ env.PC_VERSION }}_vc.sym build/polishedcrystal-dev-${{ env.SHORT_SHA }}_vc.sym
           make tidy
 
       - id: build-polishedcrystal-faithful-vc
         name: "Build polishedcrystal-faithful vc"
         run: |
           make -j$(nproc) faithful vc
-          mv polishedcrystal-faithful-3.2.0.gbc build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}_vc.gbc
-          mv polishedcrystal-faithful-3.2.0.patch build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.patch
-          mv polishedcrystal-faithful-3.2.0.sym build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}_vc.sym
+          mv polishedcrystal-faithful-${{ env.PC_VERSION }}.gbc build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}_vc.gbc
+          mv polishedcrystal-faithful-${{ env.PC_VERSION }}.patch build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}.patch
+          mv polishedcrystal-faithful-${{ env.PC_VERSION }}.sym build/polishedcrystal-faithful-dev-${{ env.SHORT_SHA }}_vc.sym
           make tidy
 
       # BUILD DEBUG ROMS
       - id: build-polisheddebug
         name: "Build polisheddebug"
         run: |
           make -j$(nproc) debug vc
-          mv polishedcrystal-debug-3.2.0.gbc build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.gbc
-          mv polishedcrystal-debug-3.2.0.sym build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.sym
+          mv polishedcrystal-debug-${{ env.PC_VERSION }}.gbc build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.gbc
+          mv polishedcrystal-debug-${{ env.PC_VERSION }}.sym build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.sym
           make tidy
 
       - id: build-polisheddebug-faithful
         name: "Build polisheddebug-faithful"
         run: |
           make -j$(nproc) faithful debug vc
-          mv polishedcrystal-faithful-debug-3.2.0.gbc build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.gbc
-          mv polishedcrystal-faithful-debug-3.2.0.sym build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.sym
+          mv polishedcrystal-faithful-debug-${{ env.PC_VERSION }}.gbc build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.gbc
+          mv polishedcrystal-faithful-debug-${{ env.PC_VERSION }}.sym build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.sym
           make tidy
 
       - id: build-polisheddebug-vc
         name: "Build polisheddebug vc"
         run: |
           make -j$(nproc) debug vc
-          mv polishedcrystal-debug-3.2.0_vc.gbc build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}_vc.gbc
-          mv polishedcrystal-debug-3.2.0.patch build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.patch
-          mv polishedcrystal-debug-3.2.0_vc.sym build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}_vc.sym
+          mv polishedcrystal-debug-${{ env.PC_VERSION }}_vc.gbc build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}_vc.gbc
+          mv polishedcrystal-debug-${{ env.PC_VERSION }}.patch build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}.patch
+          mv polishedcrystal-debug-${{ env.PC_VERSION }}_vc.sym build/polishedcrystal-debug-dev-${{ env.SHORT_SHA }}_vc.sym
           make tidy
 
       - id: build-polisheddebug-faithful-vc
         name: "Build polisheddebug-faithful vc"
         run: |
           make -j$(nproc) faithful debug vc
-          mv polishedcrystal-faithful-debug-3.2.0_vc.gbc build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}_vc.gbc
-          mv polishedcrystal-faithful-debug-3.2.0.patch build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.patch
-          mv polishedcrystal-faithful-debug-3.2.0_vc.sym build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}_vc.sym
+          mv polishedcrystal-faithful-debug-${{ env.PC_VERSION }}_vc.gbc build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}_vc.gbc
+          mv polishedcrystal-faithful-debug-${{ env.PC_VERSION }}.patch build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}.patch
+          mv polishedcrystal-faithful-debug-${{ env.PC_VERSION }}_vc.sym build/polishedcrystal-faithful-debug-dev-${{ env.SHORT_SHA }}_vc.sym
           make tidy
 
       # UPLOAD ARTIFACTS – only if the repo is owned by Rangi42 (i.e., not a fork)

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ EXTENSION := gbc
 
 TITLE := PKPCRYSTAL
 MCODE := PKPC
-ROMVERSION := 0x30
+ROMVERSION := 0x32
 
 FILLER := 0xff