diff --git a/.github/workflows/publish-alpha.yml b/.github/workflows/publish-alpha.yml index 2137054f9..8513a5319 100644 --- a/.github/workflows/publish-alpha.yml +++ b/.github/workflows/publish-alpha.yml @@ -121,7 +121,7 @@ jobs: strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-latest] + os: [windows-latest, macos-26, ubuntu-latest] steps: - name: Checkout git repo @@ -156,7 +156,7 @@ jobs: on_retry_command: pnpm cache delete - name: Build and Publish to R2 (macOS) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-26' uses: nick-invision/retry@v3.0.2 with: timeout_minutes: 30 diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 632795b21..2cc6f9176 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -115,7 +115,7 @@ jobs: strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-latest] + os: [windows-latest, macos-26, ubuntu-latest] steps: - name: Checkout git repo @@ -156,7 +156,7 @@ jobs: on_retry_command: pnpm cache delete - name: Build and Publish releases (macOS) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-26' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} uses: nick-invision/retry@v3.0.2 diff --git a/.github/workflows/publish-macos.yml b/.github/workflows/publish-macos.yml index 4d81d3241..4532e24a3 100644 --- a/.github/workflows/publish-macos.yml +++ b/.github/workflows/publish-macos.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - os: [macos-latest] + os: [macos-26] steps: - name: Checkout git repo diff --git a/.github/workflows/publish-pr.yml b/.github/workflows/publish-pr.yml index 347143049..d6ee5beff 100644 --- a/.github/workflows/publish-pr.yml +++ b/.github/workflows/publish-pr.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-26, ubuntu-latest, windows-latest] steps: - name: Checkout git repo @@ -65,7 +65,7 @@ jobs: pnpm run package:linux:pr - name: Build for MacOS - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ matrix.os == 'macos-26' }} uses: nick-invision/retry@v3.0.2 with: timeout_minutes: 30 @@ -86,7 +86,7 @@ jobs: zip -r dist/linux-binaries.zip dist/*.{AppImage,deb,rpm} - name: Zip MacOS Binaries - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ matrix.os == 'macos-26' }} run: | zip -r dist/macos-binaries.zip dist/*.dmg @@ -105,7 +105,7 @@ jobs: path: dist/linux-binaries.zip - name: Upload MacOS Binaries - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ matrix.os == 'macos-26' }} uses: actions/upload-artifact@v7 with: name: macos-binaries diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e5a497c6c..08bc4702e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-latest] + os: [windows-latest, macos-26, ubuntu-latest] steps: - name: Checkout git repo @@ -36,7 +36,7 @@ jobs: on_retry_command: pnpm cache delete - name: Build and Publish releases (macOS) - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-26' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} uses: nick-invision/retry@v3.0.2 diff --git a/assets/icons/icon.icns b/assets/icons/icon.icns deleted file mode 100644 index 551262ac5..000000000 Binary files a/assets/icons/icon.icns and /dev/null differ diff --git a/electron-builder-alpha.yml b/electron-builder-alpha.yml index d8ba96a62..2cc23db73 100644 --- a/electron-builder-alpha.yml +++ b/electron-builder-alpha.yml @@ -40,7 +40,7 @@ mac: arch: - arm64 - x64 - icon: assets/icons/icon.icns + icon: media/feishin.icon type: distribution hardenedRuntime: false identity: '-' diff --git a/electron-builder-beta.yml b/electron-builder-beta.yml index 4fcae5e5c..b4a9f5624 100644 --- a/electron-builder-beta.yml +++ b/electron-builder-beta.yml @@ -40,7 +40,7 @@ mac: arch: - arm64 - x64 - icon: assets/icons/icon.icns + icon: media/feishin.icon type: distribution hardenedRuntime: false identity: '-' diff --git a/electron-builder.yml b/electron-builder.yml index d6b7d0361..8ae7c4544 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -40,7 +40,7 @@ mac: arch: - arm64 - x64 - icon: assets/icons/icon.icns + icon: media/feishin.icon type: distribution hardenedRuntime: false identity: '-' diff --git a/media/feishin.icon/Assets/feishin.svg b/media/feishin.icon/Assets/feishin.svg new file mode 100644 index 000000000..5e0785960 --- /dev/null +++ b/media/feishin.icon/Assets/feishin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/feishin.icon/icon.json b/media/feishin.icon/icon.json new file mode 100644 index 000000000..0e834aa23 --- /dev/null +++ b/media/feishin.icon/icon.json @@ -0,0 +1,202 @@ +{ + "fill-specializations" : [ + { + "value" : { + "linear-gradient" : [ + "display-p3:0.87416,0.87416,0.87416,1.00000", + "display-p3:0.99575,0.99575,0.99575,1.00000" + ], + "orientation" : { + "start" : { + "x" : 0.5, + "y" : 1 + }, + "stop" : { + "x" : 0.5, + "y" : 0.3 + } + } + } + }, + { + "appearance" : "dark", + "value" : "system-dark" + } + ], + "groups" : [ + { + "blend-mode-specializations" : [ + { + "appearance" : "tinted", + "value" : "normal" + } + ], + "blur-material-specializations" : [ + { + "value" : 0.7 + }, + { + "appearance" : "dark", + "value" : 0.7 + }, + { + "appearance" : "tinted", + "value" : null + } + ], + "hidden" : false, + "layers" : [ + { + "blend-mode-specializations" : [ + { + "appearance" : "tinted", + "value" : "normal" + } + ], + "fill-specializations" : [ + { + "value" : { + "solid" : "extended-gray:0.00000,1.00000" + } + }, + { + "appearance" : "dark", + "value" : { + "linear-gradient" : [ + "display-p3:0.78674,0.78674,0.78674,1.00000", + "display-p3:0.87416,0.87416,0.87416,1.00000" + ], + "orientation" : { + "start" : { + "x" : 0.5, + "y" : 1 + }, + "stop" : { + "x" : 0.5, + "y" : 0 + } + } + } + }, + { + "appearance" : "tinted", + "value" : { + "solid" : "gray:1.00000,1.00000" + } + } + ], + "glass-specializations" : [ + { + "value" : true + }, + { + "appearance" : "dark", + "value" : true + }, + { + "appearance" : "tinted", + "value" : true + } + ], + "hidden" : false, + "image-name" : "feishin.svg", + "name" : "feishin", + "opacity-specializations" : [ + { + "value" : 1 + }, + { + "appearance" : "tinted", + "value" : 1 + } + ], + "position" : { + "scale" : 0.79, + "translation-in-points" : [ + 18, + -2 + ] + } + } + ], + "lighting-specializations" : [ + { + "value" : "individual" + }, + { + "appearance" : "tinted", + "value" : "combined" + } + ], + "position" : { + "scale" : 2.2, + "translation-in-points" : [ + 0, + 0 + ] + }, + "shadow-specializations" : [ + { + "value" : { + "kind" : "neutral", + "opacity" : 1 + } + }, + { + "appearance" : "dark", + "value" : { + "kind" : "layer-color", + "opacity" : 0.5 + } + }, + { + "appearance" : "tinted", + "value" : { + "kind" : "neutral", + "opacity" : 1 + } + } + ], + "specular-specializations" : [ + { + "value" : false + }, + { + "appearance" : "dark", + "value" : false + }, + { + "appearance" : "tinted", + "value" : true + } + ], + "translucency-specializations" : [ + { + "value" : { + "enabled" : true, + "value" : 0.29 + } + }, + { + "appearance" : "dark", + "value" : { + "enabled" : false, + "value" : 0.29 + } + }, + { + "appearance" : "tinted", + "value" : { + "enabled" : true, + "value" : 0.5 + } + } + ] + } + ], + "supported-platforms" : { + "squares" : [ + "macOS" + ] + } +} \ No newline at end of file