From cc6372f53d5c061c31b858e065f8cf9925c65911 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 18:43:18 +1300 Subject: [PATCH 1/5] Add zip target & arm building --- .github/workflows/prod-desktop.yml | 4 + .github/workflows/pull-desktop.yml | 4 + flatpak/.gitignore | 3 - flatpak/generated-sources.json | 191 ------------------ flatpak/us.materialio.app.json | 65 ------ .../electron/electron-builder.config.json | 3 +- 6 files changed, 10 insertions(+), 260 deletions(-) delete mode 100644 flatpak/.gitignore delete mode 100644 flatpak/generated-sources.json delete mode 100644 flatpak/us.materialio.app.json diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index 25d8d902..770cc261 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -29,6 +29,10 @@ jobs: os: macOS-latest - runtime: win-x64 os: windows-latest + - runtime: linux-arm64 + os: ubuntu-latest + - runtime: win-arm64 + os: windows-latest runs-on: ${{ matrix.os }} diff --git a/.github/workflows/pull-desktop.yml b/.github/workflows/pull-desktop.yml index 183c4f55..b302b638 100644 --- a/.github/workflows/pull-desktop.yml +++ b/.github/workflows/pull-desktop.yml @@ -26,6 +26,10 @@ jobs: os: macOS-latest - runtime: win-x64 os: windows-latest + - runtime: linux-arm64 + os: ubuntu-latest + - runtime: win-arm64 + os: windows-latest runs-on: ${{ matrix.os }} diff --git a/flatpak/.gitignore b/flatpak/.gitignore deleted file mode 100644 index 9b662c53..00000000 --- a/flatpak/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.flatpak-builder -build -builddir \ No newline at end of file diff --git a/flatpak/generated-sources.json b/flatpak/generated-sources.json deleted file mode 100644 index 06e2b84f..00000000 --- a/flatpak/generated-sources.json +++ /dev/null @@ -1,191 +0,0 @@ -[ - { - "type": "file", - "url": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", - "sha512": "13a3826919807b858399636c2fff5132a7649330c26357adbad91f95693873e01c8c3534ecf733d5f4304d7d13433f8fc6a9fd8b82f54d4dd41698e7adc0e0c4", - "dest-filename": "826919807b858399636c2fff5132a7649330c26357adbad91f95693873e01c8c3534ecf733d5f4304d7d13433f8fc6a9fd8b82f54d4dd41698e7adc0e0c4", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/13/a3" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", - "sha512": "97830cd09a699f5f216fdc6633ac300f5b937528697fd3e7f346974d2b672b50bde20b4fbc9715d85ac399b39050041f27570a64792d910503c04a9a00a5cc32", - "dest-filename": "0cd09a699f5f216fdc6633ac300f5b937528697fd3e7f346974d2b672b50bde20b4fbc9715d85ac399b39050041f27570a64792d910503c04a9a00a5cc32", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/97/83" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "sha512": "35f27853304271018b0e542aee71f11feb6fde4c99d211d0a85e413ba27bb4d25e3f9768d6594fafc759f331e89df840bb43c701d3244a8fbca34c3183d9595b", - "dest-filename": "7853304271018b0e542aee71f11feb6fde4c99d211d0a85e413ba27bb4d25e3f9768d6594fafc759f331e89df840bb43c701d3244a8fbca34c3183d9595b", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/35/f2" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "sha512": "9fc7ce8b1c030fa6ff39b8a7cd3ae9d59285cdb82f299beecff4ef7a39cb9f56907c2eabe765c4c7ce459ae0bedc723e24cedca0145752f36a114d8f1d5ac7a6", - "dest-filename": "ce8b1c030fa6ff39b8a7cd3ae9d59285cdb82f299beecff4ef7a39cb9f56907c2eabe765c4c7ce459ae0bedc723e24cedca0145752f36a114d8f1d5ac7a6", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/9f/c7" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", - "sha512": "897de67e0713308ab764a2c8b151406efefe31cd7493169b00641bf07be3035a374f53c8629adb6a443ae5ddc8fb61c61edea748a90cf4f62382824ed8a70505", - "dest-filename": "e67e0713308ab764a2c8b151406efefe31cd7493169b00641bf07be3035a374f53c8629adb6a443ae5ddc8fb61c61edea748a90cf4f62382824ed8a70505", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/89/7d" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", - "sha512": "65dce6ab02a6102396269a9e7e5a02e4e272d7e599041b1ee7e311f3ccfd83d667e1563e598524032a239a1cc97241f961b6d919c608b86024639fd8b3938cd9", - "dest-filename": "e6ab02a6102396269a9e7e5a02e4e272d7e599041b1ee7e311f3ccfd83d667e1563e598524032a239a1cc97241f961b6d919c608b86024639fd8b3938cd9", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/65/dc" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "sha512": "5ab937e5ef327422838ff02b0a5a3556b3d598df33a61e55e00b47c08b8786f317b0a7fbdd44f704e0fe6b30485bedf0389e058441fbcf2689085bc286362f30", - "dest-filename": "37e5ef327422838ff02b0a5a3556b3d598df33a61e55e00b47c08b8786f317b0a7fbdd44f704e0fe6b30485bedf0389e058441fbcf2689085bc286362f30", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/5a/b9" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "sha512": "e71a037d7f9f2fb7da0139da82658fa5b16dc21fd1efb5a630caaa1c64bae42defbc1d181eb805f81d58999df8e35b4c8f99fade4d36d765cda09c339617df43", - "dest-filename": "037d7f9f2fb7da0139da82658fa5b16dc21fd1efb5a630caaa1c64bae42defbc1d181eb805f81d58999df8e35b4c8f99fade4d36d765cda09c339617df43", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/e7/1a" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", - "sha512": "4f5d2abe4c34cf3e309e6e7ad253848343e8bd5a945ee3858611c0922c70f3fb32732ed326deeffd1ae410a1109c0c36be23d226eea202412bc67cd1d20f0fa5", - "dest-filename": "2abe4c34cf3e309e6e7ad253848343e8bd5a945ee3858611c0922c70f3fb32732ed326deeffd1ae410a1109c0c36be23d226eea202412bc67cd1d20f0fa5", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/4f/5d" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "sha512": "89b3cade203ebda6357848c44a442433405b0aa14e6993225d14ed741d2eedbe1d8ed63a267b23bcf7541d5320eb142ddc1f1fa534d61c8f40f800e333d7ebce", - "dest-filename": "cade203ebda6357848c44a442433405b0aa14e6993225d14ed741d2eedbe1d8ed63a267b23bcf7541d5320eb142ddc1f1fa534d61c8f40f800e333d7ebce", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/89/b3" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "sha512": "a52cafedb4930bb8a0f437206f0f40b913546f993957aa03b9d8d9a0c052af5deaa4b046eed07ece00a40118eaef121481dcf93f541ef2efab486768b8e388c9", - "dest-filename": "afedb4930bb8a0f437206f0f40b913546f993957aa03b9d8d9a0c052af5deaa4b046eed07ece00a40118eaef121481dcf93f541ef2efab486768b8e388c9", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/a5/2c" - }, - { - "type": "file", - "url": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "sha512": "bdeb9f726c6b8b87b75d2ad3d31c1f511ee482e2246b105ea2c0e0d34c835a1938f7077091252bbefb26ee773be5ed4f532bc87998fa9d2f15411633dbf4b85e", - "dest-filename": "9f726c6b8b87b75d2ad3d31c1f511ee482e2246b105ea2c0e0d34c835a1938f7077091252bbefb26ee773be5ed4f532bc87998fa9d2f15411633dbf4b85e", - "dest": "flatpak-node/npm-cache/_cacache/content-v2/sha512/bd/eb" - }, - { - "type": "inline", - "contents": "0e40cbf9308f2e5d26a71e11a284fc81e9f61231\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz\", \"integrity\": \"sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==\", \"time\": 0, \"size\": 2915, \"metadata\": {\"url\": \"https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "a5cf38e6aac27d8eb3fdaf635d75bf88ff4a3f834e89358608c7b67cb33d", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/46/5e" - }, - { - "type": "inline", - "contents": "1d60404b3281c92034abd12e57aa0af0e64aa315\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz\", \"integrity\": \"sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==\", \"time\": 0, \"size\": 22808, \"metadata\": {\"url\": \"https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "c98f1cdf494d5afde6448966f8b5b9ae83d1b42c6702670e15e8a7f68552", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/49/61" - }, - { - "type": "inline", - "contents": "33d1cf24d9a5d9535b6ff1f64b0b5ac9caad0e41\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz\", \"integrity\": \"sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==\", \"time\": 0, \"size\": 3513, \"metadata\": {\"url\": \"https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "4ea6b895c004375f7977d61af095ceeb988964d34da00eb00e2b1cdaa8b6", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/9b/8d" - }, - { - "type": "inline", - "contents": "443377582687c1fe1f77f7b2103e349ed7be2fab\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz\", \"integrity\": \"sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==\", \"time\": 0, \"size\": 143727, \"metadata\": {\"url\": \"https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "40d05a0809760934aebff4c68bc3fd6fb716050dc3e9d5db8756b58a6015", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/b7/b6" - }, - { - "type": "inline", - "contents": "59b3793089a7ffc915399b9b37856c79b865b6db\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz\", \"integrity\": \"sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==\", \"time\": 0, \"size\": 2512, \"metadata\": {\"url\": \"https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "3566db5ab32a9c07496acfa437f7157884ad48d9b5b195ec8315d5042d57", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/07/1d" - }, - { - "type": "inline", - "contents": "6fd8c9fd05891d4503a9d1422f58af31c33e8886\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/verror/-/verror-1.10.1.tgz\", \"integrity\": \"sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==\", \"time\": 0, \"size\": 12165, \"metadata\": {\"url\": \"https://registry.npmjs.org/verror/-/verror-1.10.1.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "d9fc26bbcb7f0d38511edac0ccf198e19a8ab1c6ead330b4e6c1c014fb3f", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/31/ad" - }, - { - "type": "inline", - "contents": "927ac8ab5aca4cf1a40e924e2c16bccc771200d9\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/crc/-/crc-3.8.0.tgz\", \"integrity\": \"sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==\", \"time\": 0, \"size\": 19779, \"metadata\": {\"url\": \"https://registry.npmjs.org/crc/-/crc-3.8.0.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "1c157566e92c1b79d308dc8695d30a603a7a56743acc66e98f644de69286", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/e8/be" - }, - { - "type": "inline", - "contents": "ae24fe580c7218ee63fcc86476862a5db5aa98e8\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz\", \"integrity\": \"sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==\", \"time\": 0, \"size\": 65652, \"metadata\": {\"url\": \"https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "0344c53990466cd8be074a97a885eb0d582fa6f17493f9c2d4b391dda9b6", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/c9/65" - }, - { - "type": "inline", - "contents": "af2f68536060cfd4de974c7e8a56e67964d9f47f\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz\", \"integrity\": \"sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==\", \"time\": 0, \"size\": 3943, \"metadata\": {\"url\": \"https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "319d4064e5cc0deeb236be141e51d18aab0148cb9c7f5794a23936482b09", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/79/e6" - }, - { - "type": "inline", - "contents": "ccf2abb094c4a3a6e197e833c5721d45d856cbbf\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz\", \"integrity\": \"sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==\", \"time\": 0, \"size\": 10978, \"metadata\": {\"url\": \"https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "f9db367edb8f679b11df27b48c582195f79a39a7fece0603ce62a83e26a3", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/b9/1b" - }, - { - "type": "inline", - "contents": "fbbfb091d6d10a4c45453b4df079a750343dd4b1\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz\", \"integrity\": \"sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==\", \"time\": 0, \"size\": 24561, \"metadata\": {\"url\": \"https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "81e485a43a0d0f46a5fb3aa04dfc18172be68dc872f60402b3933b26db82", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/36/47" - }, - { - "type": "inline", - "contents": "fc73d5c63c85bb39c4dfa330ce4ea29474d5a051\t{\"key\": \"make-fetch-happen:request-cache:https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz\", \"integrity\": \"sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==\", \"time\": 0, \"size\": 1839, \"metadata\": {\"url\": \"https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz\", \"reqHeaders\": {}, \"resHeaders\": {}}}", - "dest-filename": "6fcdb3d537b07f9252dd4a18dc9af81590673f266dd581e7d1e3aabf87c9", - "dest": "flatpak-node/npm-cache/_cacache/index-v5/db/81" - }, - { - "type": "script", - "commands": [], - "dest-filename": "electron.sh", - "dest": "flatpak-node/patch" - }, - { - "type": "script", - "commands": [ - "$FLATPAK_BUILDER_BUILDDIR/flatpak-node/patch/electron.sh" - ], - "dest-filename": "patch-all.sh", - "dest": "flatpak-node" - }, - { - "type": "script", - "commands": [ - "version=$(node --version | sed \"s/^v//\")", - "nodedir=$(dirname \"$(dirname \"$(which node)\")\")", - "mkdir -p \"flatpak-node/cache/node-gyp/$version\"", - "ln -s \"$nodedir/include\" \"flatpak-node/cache/node-gyp/$version/include\"", - "echo 9 > \"flatpak-node/cache/node-gyp/$version/installVersion\"" - ], - "dest-filename": "setup_sdk_node_headers.sh", - "dest": "flatpak-node" - }, - { - "type": "shell", - "commands": [ - "FLATPAK_BUILDER_BUILDDIR=$PWD flatpak-node/patch-all.sh", - "bash flatpak-node/setup_sdk_node_headers.sh" - ] - } -] \ No newline at end of file diff --git a/flatpak/us.materialio.app.json b/flatpak/us.materialio.app.json deleted file mode 100644 index 91ebfc60..00000000 --- a/flatpak/us.materialio.app.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "app-id": "us.materialio.app", - "runtime": "org.freedesktop.Platform", - "runtime-version": "23.08", - "sdk": "org.freedesktop.Sdk", - "base": "org.electronjs.Electron2.BaseApp", - "base-version": "23.08", - "command": "run.sh", - "finish-args": [ - "--share=ipc", - "--socket=x11", - "--socket=pulseaudio", - "--share=network" - ], - "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.node20" - ], - "build-options": { - "append-path": "/usr/lib/sdk/node20/bin", - "env": { - "XDG_CACHE_HOME": "/run/build/materialious-app/flatpak-node/cache", - "npm_config_cache": "/run/build/materialious-app/flatpak-node/npm-cache", - "npm_config_nodedir": "/usr/lib/sdk/node20", - "npm_config_offline": true - } - }, - "modules": [ - { - "name": "materialious-app", - "buildsystem": "simple", - "build-commands": [ - "cd ./main/materialious && npm install --offline", - "cd ./main/materialious && npm run build", - "cd ./main/materialious && npx cap sync @capacitor-community/electron", - "cd ./main/materialious/electron && python patch_capacitor_plugin.py", - "cd ./main/materialious/electron && npm install --offline", - "cd ./main/materialious/electron && npm run electron:pack", - "cp -a ./main/materialious/electron/dist/linux-unpacked /app/main", - "install -Dm755 -t /app/bin ./run.sh" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/Materialious/Materialious.git", - "dest": "main", - "branch": "main" - }, - { - "type": "script", - "dest-filename": "run.sh", - "commands": [ - "zypak-wrapper.sh /app/main/materialious \"$@\"" - ] - }, - { - "type": "archive", - "url": "https://github.com/electron/electron/releases/download/v33.0.2/electron-v33.0.2-linux-x64.zip", - "sha256": "933dc1eae3f2db67912b3ab056fd15a7ca3e1328fe8dd6a1f5266c5a063b1121", - "dest": "main/materialious/electron/.electron-cache" - }, - "generated-sources.json" - ] - } - ] -} \ No newline at end of file diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index bf51938b..50136c16 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -36,7 +36,8 @@ "zip", "7z", "rpm", - "AppImage" + "AppImage", + "zip" ], "category": "AudioVideo" }, From 6bae2bbf9632dcb0b4ca43098463ce21f1bb8891 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 18:46:38 +1300 Subject: [PATCH 2/5] Add portable target --- materialious/electron/electron-builder.config.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 50136c16..3ce492ea 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -24,7 +24,12 @@ "allowToChangeInstallationDirectory": true }, "win": { - "target": "nsis" + "target": [ + "nsis", + "portable", + "7z", + "zip" + ] }, "mac": { "category": "Entertainment", @@ -37,7 +42,8 @@ "7z", "rpm", "AppImage", - "zip" + "zip", + "portable" ], "category": "AudioVideo" }, From 99b8124d35f156986dd5adcd9ad97997a1192ede Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 18:47:23 +1300 Subject: [PATCH 3/5] Bump version --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 4 ++-- materialious/package.json | 4 ++-- update_versions.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 1a5b7987..b36c7f24 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 67 - versionName "1.6.16" + versionCode 68 + versionName "1.6.17" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/electron/package.json b/materialious/electron/package.json index ce317c2a..580f34c9 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.16", + "version": "1.6.17", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", @@ -40,4 +40,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file diff --git a/materialious/package.json b/materialious/package.json index 795bfb6d..9f28f026 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.16", + "version": "1.6.17", "private": true, "scripts": { "dev": "vite dev", @@ -75,4 +75,4 @@ "vidstack": "^1.12.9", "youtubei.js": "^10.5.0" } -} +} \ No newline at end of file diff --git a/update_versions.py b/update_versions.py index 751fc3b7..ca12ad8e 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.16" +LATEST_VERSION = "1.6.17" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From 6a64a5b5f7524772e01bf01d7a7a0aedba3add44 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 18:53:57 +1300 Subject: [PATCH 4/5] Use make but dont publish --- .github/workflows/pull-desktop.yml | 2 +- materialious/electron/package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-desktop.yml b/.github/workflows/pull-desktop.yml index b302b638..89df5f24 100644 --- a/.github/workflows/pull-desktop.yml +++ b/.github/workflows/pull-desktop.yml @@ -57,4 +57,4 @@ jobs: run: cd ./materialious/electron && npm install - name: Build desktop packages - run: cd ./materialious/electron && npm run electron:pack + run: cd ./materialious/electron && npm run electron:make-no-publish diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 580f34c9..b42e4241 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -18,6 +18,7 @@ "electron:start": "npm run build && electron --inspect=5858 ./", "electron:pack": "npm run build && electron-builder build --dir -c ./electron-builder.config.json", "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always", + "electron:make-no-publish": "npm run build && electron-builder build -c ./electron-builder.config.json -p never", "dist": "electron-builder" }, "dependencies": { From f1fa158db9d3aa0fac6f04cc588a21d5f849edfc Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 18:56:23 +1300 Subject: [PATCH 5/5] Remove invalid linux target --- materialious/electron/electron-builder.config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 3ce492ea..dfd1ce8b 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -42,8 +42,7 @@ "7z", "rpm", "AppImage", - "zip", - "portable" + "zip" ], "category": "AudioVideo" },