release: desktop iota 2.0.6 #8001 from iotaledger/release/desktop-iota-2.0.6

Merge pull request #8001 from iotaledger/release/desktop-iota-2.0.6

Author: begonaalvarezd

.github/workflows/build-and-release-desktop.yml

@@ -143,8 +143,8 @@ jobs:
               env:
                   CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
                   CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-                  FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-                  FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
               if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop-test.v1.yml

@@ -128,8 +128,8 @@ jobs:
         env:
           CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-          FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-          FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
         if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop-test.v2.yml

@@ -97,8 +97,8 @@ jobs:
         env:
           CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-          FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-          FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
         if: matrix.os == 'macos-11'
 

.github/workflows/build-desktop.yml

@@ -1,5 +1,8 @@
 name: Build Desktop (v2)
 
+env:
+    NETWORK_CODE: iota
+
 on:
     workflow_dispatch:
         inputs:
@@ -112,8 +115,8 @@ jobs:
               env:
                   CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
                   CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-                  FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
-                  FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
               if: matrix.os == 'macos-11'
 
@@ -164,7 +167,6 @@ jobs:
             - name: Upload artifacts
               uses: actions/upload-artifact@v2
               with:
-                  name: firefly-desktop-${{ matrix.os }}
+                  name: firefly-${{ env.NETWORK_CODE }}-desktop-${{ matrix.os }}
                   path: |
                       packages/desktop/out/firefly-*
-                      packages/desktop/out/latest*

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly IOTA",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "description": "Official wallet application of Shimmer",
     "main": "public/build/main.js",
     "repository": "[email protected]:iotaledger/firefly.git",

packages/desktop/scripts/notarize.macos.js

@@ -1,30 +1,9 @@
-const path = require('path')
-
-/**
- *
- * @param {string} appName
- * @returns void
- */
-module.exports = async (appName) => {
+module.exports = () => {
     if (process.platform !== 'darwin' || process.env.MACOS_SKIP_NOTARIZATION) {
         return undefined
     }
 
-    const APPLE_ID = process.env.FIREFLY_APPLE_ID
-    const APPLE_ID_PASSWORD = process.env.FIREFLY_APPLE_ID_PASSWORD
-
-    if (!APPLE_ID) {
-        throw Error('Notarization failed: Environment variable "FIREFLY_APPLE_ID" is not defined')
-    }
-
-    if (!APPLE_ID_PASSWORD) {
-        throw Error('Notarization failed: Environment variable "FIREFLY_APPLE_ID_PASSWORD" is not defined')
-    }
-
     return {
-        appPath: path.resolve(__dirname, `../out/mac/${appName}.app`),
-        appleId: APPLE_ID,
-        appleIdPassword: APPLE_ID_PASSWORD,
         teamId: 'UG77RJKZHH',
     }
 }