build: Improvements around build NativeShims

Set version in vcpkg and CMakeLists.txt on Github Actions build

Robustness in creating directories for macOs and Windows

Author: DennisDyallo

.github/workflows/build-nativeshims.yml

@@ -39,6 +39,18 @@ jobs:
           echo 'Running build script: Windows'
           cd Yubico.NativeShims
           & ./build-windows.ps1
+      - name: Set version
+        if: github.event.inputs.version
+        shell: pwsh
+        run: |
+          $version = "${{ github.event.inputs.version }}"
+          # Update CMakeLists.txt
+          (Get-Content Yubico.NativeShims/CMakeLists.txt) -replace 'project\(Yubico.NativeShims VERSION [^)]+\)', "project(Yubico.NativeShims VERSION $version)" | Set-Content Yubico.NativeShims/CMakeLists.txt
+          # Update vcpkg.json
+          $vcpkg = Get-Content Yubico.NativeShims/vcpkg.json -Raw | ConvertFrom-Json
+          $vcpkg.version = $version
+          $vcpkg | ConvertTo-Json | Set-Content Yubico.NativeShims/vcpkg.json
+          echo "Set version to $version"
       - uses: actions/upload-artifact@v4
         with:
           name: win-x64
@@ -71,6 +83,15 @@ jobs:
           echo 'Running build script: Linux (amd64)'
           cd Yubico.NativeShims
           sh ./build-linux-amd64.sh
+      - name: Set version
+        if: github.event.inputs.version
+        run: |
+          VERSION=${{ github.event.inputs.version }}
+          # Update CMakeLists.txt
+          sed -i "s/project(Yubico.NativeShims VERSION [^)]*)/project(Yubico.NativeShims VERSION $VERSION)/" Yubico.NativeShims/CMakeLists.txt
+          # Update vcpkg.json
+          jq --arg v "$VERSION" '.version = $v' Yubico.NativeShims/vcpkg.json > tmp.json && mv tmp.json Yubico.NativeShims/vcpkg.json
+          echo "Set version to $VERSION"
       - uses: actions/upload-artifact@v4
         with:
           name: linux-x64
@@ -85,6 +106,15 @@ jobs:
           echo 'Running build script: Linux (arm64)'
           cd Yubico.NativeShims
           sh ./build-linux-arm64.sh
+      - name: Set version
+        if: github.event.inputs.version
+        run: |
+          VERSION=${{ github.event.inputs.version }}
+          # Update CMakeLists.txt
+          sed -i "s/project(Yubico.NativeShims VERSION [^)]*)/project(Yubico.NativeShims VERSION $VERSION)/" Yubico.NativeShims/CMakeLists.txt
+          # Update vcpkg.json
+          jq --arg v "$VERSION" '.version = $v' Yubico.NativeShims/vcpkg.json > tmp.json && mv tmp.json Yubico.NativeShims/vcpkg.json
+          echo "Set version to $VERSION"
       - uses: actions/upload-artifact@v4
         with:
           name: linux-arm64
@@ -99,6 +129,15 @@ jobs:
           echo 'Running build script: macOS'
           cd Yubico.NativeShims
           sh ./build-macOS.sh
+      - name: Set version
+        if: github.event.inputs.version
+        run: |
+          VERSION=${{ github.event.inputs.version }}
+          # Update CMakeLists.txt
+          sed -i "s/project(Yubico.NativeShims VERSION [^)]*)/project(Yubico.NativeShims VERSION $VERSION)/" Yubico.NativeShims/CMakeLists.txt
+          # Update vcpkg.json
+          jq --arg v "$VERSION" '.version = $v' Yubico.NativeShims/vcpkg.json > tmp.json && mv tmp.json Yubico.NativeShims/vcpkg.json
+          echo "Set version to $VERSION"
       - uses: actions/upload-artifact@v4
         with:
           name: osx-x64

Yubico.NativeShims/build-macOS.sh

@@ -14,7 +14,7 @@ cmake \
     -DCMAKE_OSX_ARCHITECTURES=x86_64
 
 cmake --build ./build64
-mkdir osx-x64
+mkdir -p osx-x64
 cp ./build64/libYubico.NativeShims.dylib ./osx-x64
 
 cmake \
@@ -26,5 +26,5 @@ cmake \
     -DCMAKE_OSX_ARCHITECTURES=arm64
 
 cmake --build ./buildarm
-mkdir osx-arm64
+mkdir -p osx-arm64
 cp ./buildarm/libYubico.NativeShims.dylib ./osx-arm64

Yubico.NativeShims/build-windows.ps1

@@ -7,17 +7,17 @@ Pop-Location
 # 32-bit builds
 cmake -S . -B build32 -A Win32 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x86-windows-static
 cmake --build build32 --config Release
-mkdir win-x86
+New-Item -ItemType Directory -Path win-x86 -Force
 Copy-Item build32\Release\Yubico.NativeShims.dll win-x86
 
 # 64-bit builds
 cmake -S . -B build64 -A x64 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
 cmake --build build64 --config Release
-mkdir win-x64
+New-Item -ItemType Directory -Path win-x64 -Force
 Copy-Item build64\Release\Yubico.NativeShims.dll win-x64
 
 # ARM64 builds
 cmake -S . -B buildarm -A arm64 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=arm64-windows-static
 cmake --build buildarm --config Release
-mkdir win-arm64
+New-Item -ItemType Directory -Path win-arm64 -Force
 Copy-Item buildarm\Release\Yubico.NativeShims.dll win-arm64