From 2f337edb3a295027fd76a3f9cf9ced7fc57e0afe Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:37:51 +1300 Subject: [PATCH 1/6] 1.6.18 --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/electron-builder.config.json | 1 + materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index b36c7f24..f438175c 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 68 - versionName "1.6.17" + versionCode 69 + versionName "1.6.18" 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/electron-builder.config.json b/materialious/electron/electron-builder.config.json index dfd1ce8b..65ba52cc 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -1,5 +1,6 @@ { "appId": "us.materialio.app", + "artifactName": "${productName}-${version}-${platform}-${arch}", "directories": { "buildResources": "resources" }, diff --git a/materialious/electron/package.json b/materialious/electron/package.json index b42e4241..5f45ee7d 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.17", + "version": "1.6.18", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 9f28f026..d459c96e 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.17", + "version": "1.6.18", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index ca12ad8e..48c51f7c 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.17" +LATEST_VERSION = "1.6.18" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From 5dad641818a3c227c91b727e2a92d8fe6b43e891 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:38:34 +1300 Subject: [PATCH 2/6] Update package lock file --- materialious/electron/package-lock.json | 4 ++-- materialious/package-lock.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 30fed17a..8fd1984c 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.6.16", + "version": "1.6.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.6.16", + "version": "1.6.18", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/package-lock.json b/materialious/package-lock.json index 3959669d..a3b5ccb5 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,12 +1,12 @@ { "name": "materialious", - "version": "1.6.16", + "version": "1.6.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.6.16", + "version": "1.6.18", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor/android": "6.1.2", From 018230714f7b1b9f142e653b6005808df22717fe Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:44:23 +1300 Subject: [PATCH 3/6] Add ext to artifcat name --- materialious/electron/electron-builder.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 65ba52cc..ec120027 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -1,6 +1,6 @@ { "appId": "us.materialio.app", - "artifactName": "${productName}-${version}-${platform}-${arch}", + "artifactName": "${productName}-${version}-${platform}-${arch}.${ext}", "directories": { "buildResources": "resources" }, From 80aa4e9e7e23099a0c9fb688a10fcad7ec48421a Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:51:00 +1300 Subject: [PATCH 4/6] Add arch target --- materialious/electron/electron-builder.config.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index ec120027..45b4a214 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -30,6 +30,10 @@ "portable", "7z", "zip" + ], + "arch": [ + "x64", + "arm64" ] }, "mac": { @@ -45,6 +49,10 @@ "AppImage", "zip" ], + "arch": [ + "x64", + "arm64" + ], "category": "AudioVideo" }, "rpm": { From ae18a30c26605c963d80fc4f1f91ef87f3438700 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:52:38 +1300 Subject: [PATCH 5/6] Remove unwanted arm runtimes --- .github/workflows/prod-desktop.yml | 4 ---- .github/workflows/pull-desktop.yml | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index 770cc261..25d8d902 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -29,10 +29,6 @@ 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 89df5f24..f7542fd2 100644 --- a/.github/workflows/pull-desktop.yml +++ b/.github/workflows/pull-desktop.yml @@ -26,10 +26,7 @@ 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 }} From 81c950209d879d0b87b9aaf2b59316506d37b54b Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 25 Oct 2024 19:54:09 +1300 Subject: [PATCH 6/6] Fix target --- .../electron/electron-builder.config.json | 81 ++++++++++++++----- 1 file changed, 63 insertions(+), 18 deletions(-) diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json index 45b4a214..daff7e18 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -26,14 +26,34 @@ }, "win": { "target": [ - "nsis", - "portable", - "7z", - "zip" - ], - "arch": [ - "x64", - "arm64" + { + "target": "nsis", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "portable", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "7z", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "zip", + "arch": [ + "x64", + "arm64" + ] + } ] }, "mac": { @@ -42,16 +62,41 @@ }, "linux": { "target": [ - "deb", - "zip", - "7z", - "rpm", - "AppImage", - "zip" - ], - "arch": [ - "x64", - "arm64" + { + "target": "deb", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "zip", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "7z", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "rpm", + "arch": [ + "x64", + "arm64" + ] + }, + { + "target": "AppImage", + "arch": [ + "x64", + "arm64" + ] + } ], "category": "AudioVideo" },