Merge branch 'dev' into release

Kuingsmile · Dec 4, 2024 · c136852 · c136852
2 parents 08ab7ae + 1517d62
commit c136852
Show file tree

Hide file tree

Showing 4 changed files with 236 additions and 236 deletions.
diff --git a/.github/workflows/mac_beta.yml b/.github/workflows/mac_beta.yml
@@ -1,86 +1,86 @@
-# main.yml
-
-# Workflow's name
-name: Mac Beta Build
-
-# Workflow's trigger
-on:
-  workflow_dispatch:
-
-env:
-  ELECTRON_OUTPUT_PATH: ./dist_electron
-  CSC_LINK: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-  CSC_KEY_PASSWORD: ${{ secrets.P12_PASSWORD }}
-
-jobs:
-  release:
-    name: build and release electron app
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-12]
-
-    steps:
-      - name: Check out git repository
-        uses: actions/checkout@v2
-
-      # step2: sign
-      - name: Install the Apple certificates
-        if: matrix.os == 'macos-12'
-        run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-
-      # step3: install node env
-      - name: Install Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.x'
-
-      - name: Install system deps
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
-
-      # step3: yarn
-      - name: Yarn install macos
-        if: matrix.os == 'macos-12'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-          npm rebuild --platform=darwin --arch=arm64 sharp
-
-      - name: Yarn install windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-        
-      - name: Yarn install linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-
-      - name: Build  & release app
-        run: |
-          yarn run build
-          yarn upload-beta
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          R2_SECRET_ID: ${{ secrets.R2_SECRET_ID }}
-          R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
-          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
-          ELECTRON_SKIP_NOTARIZATION: ${{ secrets.ELECTRON_SKIP_NOTARIZATION }}
-          XCODE_APP_LOADER_EMAIL: ${{ secrets.XCODE_APP_LOADER_EMAIL }}
-          XCODE_APP_LOADER_PASSWORD: ${{ secrets.XCODE_APP_LOADER_PASSWORD }}
-          XCODE_TEAM_ID: ${{ secrets.XCODE_TEAM_ID }}
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+# main.yml
+
+# Workflow's name
+name: Mac Beta Build
+
+# Workflow's trigger
+on:
+  workflow_dispatch:
+
+env:
+  ELECTRON_OUTPUT_PATH: ./dist_electron
+  CSC_LINK: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+  CSC_KEY_PASSWORD: ${{ secrets.P12_PASSWORD }}
+
+jobs:
+  release:
+    name: build and release electron app
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-14]
+
+    steps:
+      - name: Check out git repository
+        uses: actions/checkout@v2
+
+      # step2: sign
+      - name: Install the Apple certificates
+        if: matrix.os == 'macos-14'
+        run: |
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+
+      # step3: install node env
+      - name: Install Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+
+      - name: Install system deps
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
+
+      # step3: yarn
+      - name: Yarn install macos
+        if: matrix.os == 'macos-14'
+        run: |
+          yarn
+          yarn global add xvfb-maybe
+          npm rebuild --platform=darwin --arch=arm64 sharp
+
+      - name: Yarn install windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          yarn
+          yarn global add xvfb-maybe
+        
+      - name: Yarn install linux
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          yarn
+          yarn global add xvfb-maybe
+
+      - name: Build  & release app
+        run: |
+          yarn run build
+          yarn upload-beta
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          R2_SECRET_ID: ${{ secrets.R2_SECRET_ID }}
+          R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          ELECTRON_SKIP_NOTARIZATION: ${{ secrets.ELECTRON_SKIP_NOTARIZATION }}
+          XCODE_APP_LOADER_EMAIL: ${{ secrets.XCODE_APP_LOADER_EMAIL }}
+          XCODE_APP_LOADER_PASSWORD: ${{ secrets.XCODE_APP_LOADER_PASSWORD }}
+          XCODE_TEAM_ID: ${{ secrets.XCODE_TEAM_ID }}
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
diff --git a/.github/workflows/mac_build.yml b/.github/workflows/mac_build.yml
@@ -1,75 +1,75 @@
-# main.yml
-
-# Workflow's name
-name: Mac Build
-
-# Workflow's trigger
-on:
-  workflow_dispatch:
-
-env:
-  ELECTRON_OUTPUT_PATH: ./dist_electron
-  CSC_LINK: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-  CSC_KEY_PASSWORD: ${{ secrets.P12_PASSWORD }}
-
-# Workflow's jobs
-jobs:
-  # job's id
-  release:
-    # job's name
-    name: build and release electron app
-
-    # the type of machine to run the job on
-    runs-on: ${{ matrix.os }}
-
-    # create a build matrix for jobs
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-12]
-
-    # create steps
-    steps:
-      # step1: check out repository
-      - name: Check out git repository
-        uses: actions/checkout@v2
-
-      # step2: sign
-      - name: Install the Apple certificates
-        if: matrix.os == 'macos-12'
-        run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-
-      # step3: install node env
-      - name: Install Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.x'
-
-      # step3: yarn
-      - name: Yarn install macos
-        if: matrix.os == 'macos-12'
-        run: |
-          yarn
-          yarn global add xvfb-maybe
-          npm rebuild --platform=darwin --arch=arm64 sharp
-
-      - name: Build  & release app
-        run: |
-          yarn build
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          R2_SECRET_ID: ${{ secrets.R2_SECRET_ID }}
-          R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
-          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
-          ELECTRON_SKIP_NOTARIZATION: ${{ secrets.ELECTRON_SKIP_NOTARIZATION }}
-          XCODE_APP_LOADER_EMAIL: ${{ secrets.XCODE_APP_LOADER_EMAIL }}
-          XCODE_APP_LOADER_PASSWORD: ${{ secrets.XCODE_APP_LOADER_PASSWORD }}
-          XCODE_TEAM_ID: ${{ secrets.XCODE_TEAM_ID }}
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+# main.yml
+
+# Workflow's name
+name: Mac Build
+
+# Workflow's trigger
+on:
+  workflow_dispatch:
+
+env:
+  ELECTRON_OUTPUT_PATH: ./dist_electron
+  CSC_LINK: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+  CSC_KEY_PASSWORD: ${{ secrets.P12_PASSWORD }}
+
+# Workflow's jobs
+jobs:
+  # job's id
+  release:
+    # job's name
+    name: build and release electron app
+
+    # the type of machine to run the job on
+    runs-on: ${{ matrix.os }}
+
+    # create a build matrix for jobs
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-14]
+
+    # create steps
+    steps:
+      # step1: check out repository
+      - name: Check out git repository
+        uses: actions/checkout@v2
+
+      # step2: sign
+      - name: Install the Apple certificates
+        if: matrix.os == 'macos-14'
+        run: |
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+
+      # step3: install node env
+      - name: Install Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+
+      # step3: yarn
+      - name: Yarn install macos
+        if: matrix.os == 'macos-14'
+        run: |
+          yarn
+          yarn global add xvfb-maybe
+          npm rebuild --platform=darwin --arch=arm64 sharp
+
+      - name: Build  & release app
+        run: |
+          yarn build
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          R2_SECRET_ID: ${{ secrets.R2_SECRET_ID }}
+          R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          ELECTRON_SKIP_NOTARIZATION: ${{ secrets.ELECTRON_SKIP_NOTARIZATION }}
+          XCODE_APP_LOADER_EMAIL: ${{ secrets.XCODE_APP_LOADER_EMAIL }}
+          XCODE_APP_LOADER_PASSWORD: ${{ secrets.XCODE_APP_LOADER_PASSWORD }}
+          XCODE_TEAM_ID: ${{ secrets.XCODE_TEAM_ID }}
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-12, windows-latest]
+        os: [ubuntu-latest, macos-14, windows-latest]
 
     steps:
 
@@ -37,7 +37,7 @@ jobs:
 
       # step2: sign
       - name: Install the Apple certificates
-        if: matrix.os == 'macos-12'
+        if: matrix.os == 'macos-14'
         run: |
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
@@ -55,7 +55,7 @@ jobs:
 
       # step3: yarn
       - name: Yarn install macos
-        if: matrix.os == 'macos-12'
+        if: matrix.os == 'macos-14'
         run: |
           yarn
           yarn global add xvfb-maybe