From e144c871166debe534d766d882167c1c07cec983 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 21 Feb 2025 13:43:02 +1300 Subject: [PATCH] Fix manifest editing --- .github/workflows/prod-flathub.yml | 3 +-- materialious/android/app/build.gradle | 4 ++-- materialious/electron/materialious.metainfo.xml | 6 +++++- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/prod-flathub.yml b/.github/workflows/prod-flathub.yml index 5f59d212..0e4c54ce 100644 --- a/.github/workflows/prod-flathub.yml +++ b/.github/workflows/prod-flathub.yml @@ -39,10 +39,9 @@ jobs: CHECKSUM=$(curl -L ${{ steps.get_release.outputs.aarch64_url }} | sha256sum | awk '{ print $1 }') echo "aarch64_sha256=$CHECKSUM" >> "$GITHUB_OUTPUT" - - name: Update manifest file with new version and checksums + - name: Update manifest file with new urls and checksums run: | MANIFEST_FILE="us.materialio.Materialious.yml" - yq eval -i ".version = \"${{ steps.get_release.outputs.version }}\"" $MANIFEST_FILE yq eval -i ".modules[0].sources[0].url = \"${{ steps.get_release.outputs.x86_url }}\"" $MANIFEST_FILE yq eval -i ".modules[0].sources[0].sha256 = \"${{ steps.sha256_x86.outputs.x86_64_sha256 }}\"" $MANIFEST_FILE yq eval -i ".modules[0].sources[1].url = \"${{ steps.get_release.outputs.aarch64_url }}\"" $MANIFEST_FILE diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 3ba2b2a3..de19fc95 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 95 - versionName "1.7.13" + versionCode 96 + versionName "1.7.14" 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/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 2e73ad6a..ddd969d8 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -56,7 +56,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.7.14 + + https://github.com/Materialious/Materialious/releases/tag/1.7.13 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index cef00410..413ced29 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.7.13", + "version": "1.7.14", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 61c179d7..bef5bdbd 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.7.13", + "version": "1.7.14", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index ab69979b..9e32a591 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.7.13" +LATEST_VERSION = "1.7.14" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")