From ddbac0e50348ad3883719b4e11e8f413f6377965 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 10:04:54 +0100
Subject: [PATCH] Try to fix version number

---
 .github/workflows/sdrangel.yml | 43 +++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index eeefbc743..899f6591e 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -101,6 +101,28 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+        # Need with clause so git describe --tags works?
+      - name: Get version
+        id: get_version
+        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+        # Requires git fetch --tags upstream to have been run!
+      - name: Get version 3
+        id: get_version3
+        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+        # This just gives branch name
+      - name: Get OS version
+        id: get_os_version
+        run: |
+          sw_vers -productVersion
+          echo "os_version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
+      - name: Diplay version
+        run: |
+          echo ${{ steps.get_version.outputs.version }}
+          echo ${{ steps.get_version3.outputs.version }}
+          echo ${{ steps.get_os_version.outputs.version }}
       - name: Update brew
         run: brew update
       - name: Install brew packages
@@ -110,25 +132,8 @@ jobs:
           mkdir build && cd build
           cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
           make package -j4
-      - id: get_version2
-        uses: battila7/get-version-action@v2
-      - name: Get version
-        id: get_version
-        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
-        # Requires git fetch --tags upstream to have been run!
-      - name: Set output
-        id: get_version3
-        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-      - name: Diplay version
-        run: |
-          echo ${{ steps.get_version.outputs.version }}
-          echo ${{ steps.get_version2.outputs.version }}
-          echo ${{ steps.get_version3.outputs.version }}
-      - name: Get OS version
-        id: get_os_version
-        run: echo "version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg
-          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg
+          name: sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg
+          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg