[DESKTOP] Add Mac x64 build lane

kamgurgul · Jan 16, 2025 · e6dd867 · e6dd867
1 parent 8f932de
commit e6dd867
Showing 1 changed file with 58 additions and 58 deletions.
diff --git a/.github/workflows/desktop_release.yml b/.github/workflows/desktop_release.yml
@@ -121,66 +121,66 @@ jobs:
       - name: Create path variables
         id: path_variables
         run: |
-            name="CPU-Info-arm64-${{ github.event.inputs.version }}.dmg"
-            path="desktopApp/build/compose/binaries/main-release/dmg/CPU-Info-${{ github.event.inputs.version }}.dmg"
-            echo "RELEASE_NAME=$name" >> $GITHUB_ENV
-            echo "RELEASE_PATH=$path" >> $GITHUB_ENV
-
-      -   name: Create and notarize DMG
-          run: |
-              ./gradlew desktopApp:notarizeReleaseDmg -PmacOsNotarization=true \
-              -Pcompose.desktop.mac.notarization.appleID=$MAC_NOTARIZATION_ID \
-              -Pcompose.desktop.mac.notarization.password=$MAC_NOTARIZATION_PWD \
-              -Pcompose.desktop.mac.notarization.teamID=$MAC_APPSTORE_TEAM_ID
-          env:
-              MAC_NOTARIZATION_ID: ${{ secrets.MAC_NOTARIZATION_ID }}
-              MAC_NOTARIZATION_PWD: ${{ secrets.MAC_NOTARIZATION_PWD }}
-              MAC_APPSTORE_TEAM_ID: ${{ secrets.MAC_APPSTORE_TEAM_ID }}
-              RELEASE_PATH: ${{ env.RELEASE_PATH }}
-
-      -   name: Upload DMG
-          uses: actions/upload-artifact@v4
-          with:
-              name: ${{ env.RELEASE_NAME }}
-              path: ${{ env.RELEASE_PATH }}
+          name="CPU-Info-arm64-${{ github.event.inputs.version }}.dmg"
+          path="desktopApp/build/compose/binaries/main-release/dmg/CPU-Info-${{ github.event.inputs.version }}.dmg"
+          echo "RELEASE_NAME=$name" >> $GITHUB_ENV
+          echo "RELEASE_PATH=$path" >> $GITHUB_ENV
+
+      - name: Create and notarize DMG
+        run: |
+          ./gradlew desktopApp:notarizeReleaseDmg -PmacOsNotarization=true \
+          -Pcompose.desktop.mac.notarization.appleID=$MAC_NOTARIZATION_ID \
+          -Pcompose.desktop.mac.notarization.password=$MAC_NOTARIZATION_PWD \
+          -Pcompose.desktop.mac.notarization.teamID=$MAC_APPSTORE_TEAM_ID
+        env:
+          MAC_NOTARIZATION_ID: ${{ secrets.MAC_NOTARIZATION_ID }}
+          MAC_NOTARIZATION_PWD: ${{ secrets.MAC_NOTARIZATION_PWD }}
+          MAC_APPSTORE_TEAM_ID: ${{ secrets.MAC_APPSTORE_TEAM_ID }}
+          RELEASE_PATH: ${{ env.RELEASE_PATH }}
+
+      - name: Upload DMG
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.RELEASE_NAME }}
+          path: ${{ env.RELEASE_PATH }}
 
   build_mac_x64_dmg:
-      needs: code_quality
-      runs-on: macos-13
-      steps:
-          -   uses: actions/checkout@v4
-
-          -   name: set up JDK 18
-              uses: actions/setup-java@v4
-              with:
-                  distribution: 'zulu'
-                  java-version: 18
-                  cache: gradle
-
-          -   name: Setup Gradle
-              uses: gradle/actions/setup-gradle@v4
-              with:
-                  gradle-home-cache-cleanup: true
-                  cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
-
-          -   name: Cache KMP tooling
-              uses: actions/cache@v4
-              with:
-                  path: |
-                      ~/.konan
-                  key: ${{ runner.os }}-v1-${{ hashFiles('*.versions.toml') }}
-
-          -   name: Import certs
-              uses: apple-actions/import-codesign-certs@v3
-              with:
-                  p12-file-base64: ${{ secrets.MAC_NOTARIZATION_CERT }}
-                  p12-password: ${{ secrets.MAC_NOTARIZATION_CERT_PASS }}
-
-          -   name: Create path variables
-              id: path_variables
-              run: |
-                  name="CPU-Info-x64-${{ github.event.inputs.version }}.dmg"
-                  path="desktopApp/build/compose/binaries/main-release/dmg/CPU-Info-${{ github.event.inputs.version }}.dmg"
+    needs: code_quality
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up JDK 18
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 18
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-home-cache-cleanup: true
+          cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
+
+      - name: Cache KMP tooling
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.konan
+          key: ${{ runner.os }}-v1-${{ hashFiles('*.versions.toml') }}
+
+      - name: Import certs
+        uses: apple-actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.MAC_NOTARIZATION_CERT }}
+          p12-password: ${{ secrets.MAC_NOTARIZATION_CERT_PASS }}
+
+      - name: Create path variables
+        id: path_variables
+        run: |
+          name="CPU-Info-x64-${{ github.event.inputs.version }}.dmg"
+          path="desktopApp/build/compose/binaries/main-release/dmg/CPU-Info-${{ github.event.inputs.version }}.dmg"
           echo "RELEASE_NAME=$name" >> $GITHUB_ENV
           echo "RELEASE_PATH=$path" >> $GITHUB_ENV