macOS build on Actions

.github/workflows/build-macos.yml

@@ -0,0 +1,42 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: TheDesk Build on macOS
+
+on:
+  release:
+    types:
+      - edited
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+    environment:
+      name: build
+    env: 
+      APPLEID: ${{ secrets.APPLEID }}
+      APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+      CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+      CSC_LINK: ${{ secrets.CSC_LINK}}
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: cd app && yarn
+    - run: cd app && yarn build:all
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.zip"
+    - uses: shogo82148/actions-upload-release-asset@v1
+      with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "build/*.dmg"

app/build.js

@@ -34,7 +34,7 @@ const config = {
     nsis: {
         oneClick: false,
         allowToChangeInstallationDirectory: true,
-        artifactName: 'TheDesk-setup.${ext}',
+        artifactName: 'TheDesk-setup-${arch}.${ext}',
     },
     linux: {
         target: ['zip', 'appImage', 'snap', 'deb'],
@@ -77,7 +77,7 @@ async function cmd(options) {
                     '../build/TheDesk-ia32-store.exe'
                 )
                 fs.renameSync(
-                    `../build/TheDesk-setup.exe`,
+                    `../build/TheDesk-setup-ia32.exe`,
                     '../build/TheDesk-setup-ia32-store.exe'
                 )
             }
@@ -88,7 +88,7 @@ async function cmd(options) {
                     '../build/TheDesk-store.exe'
                 )
                 fs.renameSync(
-                    `../build/TheDesk-setup.exe`,
+                    `../build/TheDesk-setup-x64.exe`,
                     '../build/TheDesk-setup-store.exe'
                 )
             }
@@ -121,10 +121,6 @@ async function cmd(options) {
                     `../build/TheDesk ${version}.exe`,
                     '../build/TheDesk-ia32.exe'
                 )
-                fs.renameSync(
-                    `../build/TheDesk-setup.exe`,
-                    '../build/TheDesk-setup-ia32.exe'
-                )
             }
             if (arch == 'x64') {
                 await build(Platform.WINDOWS, Arch.x64, config)
@@ -132,6 +128,10 @@ async function cmd(options) {
                     `../build/TheDesk ${version}.exe`,
                     '../build/TheDesk.exe'
                 )
+                fs.renameSync(
+                    `../build/TheDesk-setup-x64.exe`,
+                    '../build/TheDesk-setup.exe'
+                )
             }
             if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') {
                 await build(Platform.WINDOWS, Arch.arm64, config)
@@ -139,10 +139,6 @@ async function cmd(options) {
                     `../build/TheDesk ${version}.exe`,
                     '../build/TheDesk-arm64.exe'
                 )
-                fs.renameSync(
-                    `../build/TheDesk-setup.exe`,
-                    '../build/TheDesk-setup-arm64.exe'
-                )
             }
         }
         if ((platform == 'linux' && !isTrue(options, 'skipLinux')) || isTrue(options, 'linux', 'l')) {

app/view/pl-PL/acct.html

@@ -21,7 +21,7 @@
 	</script>
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
 	-->
-	<script>var pwa = false;</script> <script>var store = false;</script>
+	<script>var pwa = false;</script> <script>var store = true;</script>
 </head>
 
 <body id="mainView" class="">

app/view/pl-PL/index.html

@@ -21,13 +21,13 @@
 		_jipt.push(['project', 'thedesk'])
 	</script>
 	<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-	--> <script>var pwa = false;</script> <script>var store = false;</script>
+	--> <script>var pwa = false;</script> <script>var store = true;</script>
 </head>
 
 <body class="">
 	<script>
 		var ver = '22.2.0 (Koume)'
-		var gitHash = '3e0a048e28be6393d1752c9888125c4af6c962b1'
+		var gitHash = 'a7349d574d803f034cf418d6b3f2264643dff1f5'
 		//betaを入れるとバージョンチェックしない
 		//var ver="beta";
 		var acct_id = 0

app/view/pl-PL/setting.html

@@ -33,7 +33,7 @@
 		}
 	</style>
 	<script>var pwa = false;</script>
-	<script>var store = false;</script>
+	<script>var store = true;</script>
 </head>
 
 <body id="mainView" style="overflow-y:scroll" class="">
@@ -690,7 +690,7 @@
 		style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Main author: Cutls@cutls.com</a>
 	<br>
-	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/3e0a048e28be6393d1752c9888125c4af6c962b1">3e0a048e28be6393d1752c9888125c4af6c962b1</a> - <a
+	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/a7349d574d803f034cf418d6b3f2264643dff1f5">a7349d574d803f034cf418d6b3f2264643dff1f5</a> - <a
 		onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer pwa">Sprawdź aktualizacje</a><br>
 	<br>
@@ -700,7 +700,7 @@
 		<img src="https://status.cutls.com/badge-service?site=thedesk.top">
 	</a><br>
 	<h5>OSS License</h5>
-	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/3e0a048e28be6393d1752c9888125c4af6c962b1"
+	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/a7349d574d803f034cf418d6b3f2264643dff1f5"
 		alt="FOSSA Status"><img
 			src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
 	<br>