build: Name packages with proper version

mefistotelis · Dec 21, 2024 · 6d9f9bb · 6d9f9bb
1 parent d4a2c86
commit 6d9f9bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build-sdk75.yml b/.github/workflows/build-sdk75.yml
@@ -162,11 +162,13 @@ jobs:
         mv -t "${PKG_WORKSPACE}/plugins" "${RUNNER_WORKSPACE}/idasdk75/bin/plugins/loadmap"*
         cp "${REPO_WORKSPACE}/README.md" "${PKG_WORKSPACE}/readme-loadmap.md"
         #7z a "${PKG_WORKSPACE}/loadmap.zip" "${PKG_WORKSPACE}/"* # do not compress, or upload will do that again
+        VER_MAJ_MIN=$(sed -n 's/^#define[ ]\+PLUG_VERSION "\([^"]\+\)".*$/\1/p' "${RUNNER_WORKSPACE}/idasdk75/plugins/loadmap/src/LoadMap.cpp" | head -n 1 | tr '.' '_')
         VER_BUILD=$(git -C "${REPO_WORKSPACE}" rev-list --count HEAD)
-        echo "PKG_NAME=loadmap-v1_3_$VER_BUILD-plug-ida75-win32" >> $GITHUB_ENV
+        PKG_VERSION="${VER_MAJ_MIN}_${VER_BUILD}"
+        echo "PKG_NAME=loadmap-v$PKG_VERSION-plug-ida75-win32" >> $GITHUB_ENV
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.PKG_NAME }}
         path: ${{ github.workspace }}/pkg/*
diff --git a/.github/workflows/build-sdk9.yml b/.github/workflows/build-sdk9.yml
@@ -162,11 +162,13 @@ jobs:
         mv -t "${PKG_WORKSPACE}/plugins" "${RUNNER_WORKSPACE}/idasdk90/bin/plugins/loadmap"*
         cp "${REPO_WORKSPACE}/README.md" "${PKG_WORKSPACE}/readme-loadmap.md"
         #7z a "${PKG_WORKSPACE}/loadmap.zip" "${PKG_WORKSPACE}/"* # do not compress, or upload will do that again
+        VER_MAJ_MIN=$(sed -n 's/^#define[ ]\+PLUG_VERSION "\([^"]\+\)".*$/\1/p' "${RUNNER_WORKSPACE}/idasdk90/plugins/loadmap/src/LoadMap.cpp" | head -n 1 | tr '.' '_')
         VER_BUILD=$(git -C "${REPO_WORKSPACE}" rev-list --count HEAD)
-        echo "PKG_NAME=loadmap-v1_3_$VER_BUILD-plug-ida90-win32" >> $GITHUB_ENV
+        PKG_VERSION="${VER_MAJ_MIN}_${VER_BUILD}"
+        echo "PKG_NAME=loadmap-v$PKG_VERSION-plug-ida90-win32" >> $GITHUB_ENV
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.PKG_NAME }}
         path: ${{ github.workspace }}/pkg/*