Fix CI

prof18 · Dec 24, 2024 · e96655b · e96655b
1 parent e0b45f5
commit e96655b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml
@@ -22,6 +22,7 @@ runs:
         cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
 
     - name: Setup Gradle Properties
+      if: runner.os != 'Windows'
       shell: bash
       run: |
         echo "org.gradle.jvmargs=-Xms10g -Xmx10g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" >> ~/.gradle/gradle.properties

diff --git a/.github/workflows/desktop-window-release.yml b/.github/workflows/desktop-window-release.yml
@@ -25,37 +25,39 @@ jobs:
           gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
 
       - name: Update Licenses file
-        run: ./gradlew desktopApp:exportLibraryDefinitions -PaboutLibraries.exportPath=src/main/resources/
+        run: ./gradlew desktopApp:exportLibraryDefinitions "-PaboutLibraries.exportPath=src/main/resources/"
 
       - name: Create path variables
         id: path_variables
+        shell: pwsh
         run: |
-          tag=$(git describe --tags --abbrev=0 --match "*-desktop")
-          version=$(echo "$tag" | sed 's/-desktop$//')
-          name="FeedFlow-${version}.msi"
-          path="desktopApp/build/release/main-release/msi/${name}"
-          echo "TAG=$tag" >> $GITHUB_ENV
-          echo "VERSION=$version" >> $GITHUB_ENV
-          echo "RELEASE_PATH=$path" >> $GITHUB_ENV
-          echo "NAME=$name" >> $GITHUB_ENV
+          $tag = $(git describe --tags --abbrev=0 --match "*-desktop")
+          $version = $tag -replace '-desktop$', ''
+          $name = "FeedFlow-${version}.msi"
+          $path = "desktopApp/build/release/main-release/msi/${name}"
+          "TAG=$tag" >> $env:GITHUB_ENV
+          "VERSION=$version" >> $env:GITHUB_ENV
+          "RELEASE_PATH=$path" >> $env:GITHUB_ENV
+          "NAME=$name" >> $env:GITHUB_ENV
 
       - name: Create Properties file
+        shell: pwsh
         run: |
-          echo "is_release=true" >> desktopApp/src/jvmMain/resources/props.properties
-          echo "sentry_dns=$SENTRY_DNS" >> desktopApp/src/jvmMain/resources/props.properties
-          echo "version=$VERSION" >> desktopApp/src/jvmMain/resources/props.properties
-          echo "dropbox_key=$DROPBOX_API_KEY" >> desktopApp/src/jvmMain/resources/props.properties
+          "is_release=true" >> desktopApp/src/jvmMain/resources/props.properties
+          "sentry_dns=$env:SENTRY_DNS" >> desktopApp/src/jvmMain/resources/props.properties
+          "version=$env:VERSION" >> desktopApp/src/jvmMain/resources/props.properties
+          "dropbox_key=$env:DROPBOX_API_KEY" >> desktopApp/src/jvmMain/resources/props.properties
         env:
           SENTRY_DNS: ${{ secrets.SENTRY_DNS }}
           VERSION: ${{ env.VERSION }}
           DROPBOX_API_KEY: ${{ secrets.DROPBOX_API_KEY }}
 
-      - name: Create DMG
+      - name: Create MSI
         run: ./gradlew packageReleaseMsi
 
       # TODO: remove, just for testing
       - name: Upload asset
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ env.RELEASE_PATH }}
           name: ${{ env.RELEASE_NAME }}