workflow updated

nor0x · Oct 18, 2023 · cb8ed63 · cb8ed63
1 parent 789ed1b
commit cb8ed63
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,33 +85,31 @@ jobs:
         dotnet-version: '8.0.x'
     - name: restore workloads
       run: |
-        ls
-        echo $GITHUB_WORKSPACE
-        cd $GITHUB_WORKSPACE/src
+        cd $GITHUB_WORKSPACE/Dots/Dots/src
         dotnet workload restore
     - name: run housekeeping scripts
       run: |
-        cd $GITHUB_WORKSPACE/scripts
+        cd $GITHUB_WORKSPACE/Dots/Dots/scripts
         bash housekeeping.sh
     - name: run build scripts
       run: |
-        cd $GITHUB_WORKSPACE/scripts
+        cd $GITHUB_WORKSPACE/Dots/Dots/scripts
         bash build-windows.sh
         echo "windowsx86file=${{ env.windowsx86file }}" >> "$GITHUB_ENV"
         echo "windowsx64file=${{ env.windowsx64file }}" >> "$GITHUB_ENV"
         echo "windowsarm64file=${{ env.windowsarm64file }}" >> "$GITHUB_ENV"
     - uses: actions/upload-artifact@v3.1.3
       with:
         name: ${{ env.windowsx86file }}
-        path: ${{ github.workspace }}/src/bin/Release/net8.0/win-x86/publish/${{ env.windowsx86file }}
+        path: ${{ github.workspace }}/Dots/Dots/src/bin/Release/net8.0/win-x86/publish/${{ env.windowsx86file }}
     - uses: actions/upload-artifact@v3.1.3
       with:
         name: ${{ env.windowsx64file }}
-        path: ${{ github.workspace }}/src/bin/Release/net8.0/win-x64/publish/${{ env.windowsx64file }}
+        path: ${{ github.workspace }}/Dots/Dots/src/bin/Release/net8.0/win-x64/publish/${{ env.windowsx64file }}
     - uses: actions/upload-artifact@v3.1.3
       with:
         name: ${{ env.windowsarm64file }}
-        path: ${{ github.workspace }}/src/bin/Release/net8.0/win-arm64/publish/${{ env.windowsarm64file }}
+        path: ${{ github.workspace }}/Dots/Dots/src/bin/Release/net8.0/win-arm64/publish/${{ env.windowsarm64file }}
 
   create-release:
     needs: [build-macos, build-windows]

diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
@@ -2,6 +2,7 @@ cd ..
 version=$(cat version.txt)
 
 cd src/
+dotnet restore
 echo "Building Dots for macOS x64"
 dotnet msbuild -t:BundleApp -property:Configuration=Release -p:UseAppHost=true -p:RuntimeIdentifier=osx-x64
 echo "Building Dots for macOS arm64"

diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
@@ -1,8 +1,8 @@
 cd ..
 version=$(cat version.txt)
 
-cd src/
-
+cd src
+dotnet restore
 echo "Building Dots for Windows x64"
 dotnet publish "Dots.csproj" -c Release -f net8.0 -r win-x64
 echo "Building Dots for Windows x86"

diff --git a/scripts/housekeeping.sh b/scripts/housekeeping.sh
@@ -4,3 +4,5 @@ cd 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
+
+echo "Version is now $version"