From c12a72f157a3cf6e37a723ebf1fcc03e8edb45a3 Mon Sep 17 00:00:00 2001
From: Johnny <nor0x@users.noreply.github.com>
Date: Thu, 19 Oct 2023 11:23:30 +0200
Subject: [PATCH] shell fixes on windows agent

---
 .github/workflows/release.yml | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9bceb18..3967a17 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,16 +11,6 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4.1.1
-    - name: Log GITHUB_WORKSPACE
-      run: |
-        echo "GITHUB_WORKSPACE is $GITHUB_WORKSPACE"
-        echo "current directory"
-        ls
-        echo "GITHUB_WORKSPACE directory"
-        ls $GITHUB_WORKSPACE
-        echo "src directory"
-        ls $GITHUB_WORKSPACE/src
-
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3.2.0
       with:
@@ -80,31 +70,22 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4.1.1
-    - name: Log GITHUB_WORKSPACE
-      shell: bash
-      run: |
-        echo "GITHUB_WORKSPACE is $GITHUB_WORKSPACE"
-        echo "current directory"
-        ls
-        echo "GITHUB_WORKSPACE directory"
-        ls $GITHUB_WORKSPACE
-        echo "src directory"
-        ls $GITHUB_WORKSPACE/src
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: '8.0.x'
     - name: restore workloads
+      shell: bash
       run: |
-        cd D:/a/Dots/Dots/src
+        cd $GITHUB_WORKSPACE/src
         dotnet workload restore
     - name: run housekeeping scripts
       shell: bash
       run: |
-        cd D:/a/Dots/Dots/
+        cd $GITHUB_WORKSPACE
         version=$(cat version.txt)
         echo "Version is now $version" 
-        cd D:/a/Dots/Dots/src
+        cd $GITHUB_WORKSPACE/src
         sed -i '' "s/CFBundleVersion>.*</CFBundleVersion>$version</" Dots.csproj
         sed -i '' "s/CFBundleShortVersionString>.*</CFBundleShortVersionString>$version</" Dots.csproj
         sed -i '' "s/Version>.*</Version>$version</" Dots.csproj
@@ -121,22 +102,22 @@ jobs:
         echo "filenames: $macosx64file $macosarm64file $windowsx86file $windowsx64file $windowsarm64file"
     - name: run build scripts
       run: |
-        cd D:/a/Dots/Dots/scripts
+        cd $GITHUB_WORKSPACE/scripts
         bash build-windows.sh
         echo "windowsarm64file=$windowsarm64file" >> $GITHUB_ENV
         echo "windowsx64file=$windowsx64file" >> $GITHUB_ENV
         echo "windowsx86file=$windowsx86file" >> $GITHUB_ENV
     - uses: actions/upload-artifact@v3.1.3
       with:
-        name: ${{ env.windowsx86file }}}
+        name: ${{ env.windowsx86file }}
         path: D:/a/Dots/Dots/src/bin/Release/net8.0/win-x86/publish/*.zip
     - uses: actions/upload-artifact@v3.1.3
       with:
-        name: ${{ env.windowsx64file }}}
+        name: ${{ env.windowsx64file }}
         path: D:/a/Dots/Dots/src/bin/Release/net8.0/win-x64/publish/*.zip
     - uses: actions/upload-artifact@v3.1.3
       with:
-        name: ${{ env.windowsarm64file }}}
+        name: ${{ env.windowsarm64file }}
         path: D:/a/Dots/Dots/src/bin/Release/net8.0/win-arm64/publish/*.zip
 
   create-release: