diff --git a/.github/workflows/prod-flathub.yml b/.github/workflows/prod-flathub.yml index 36345e60..cd9cba67 100644 --- a/.github/workflows/prod-flathub.yml +++ b/.github/workflows/prod-flathub.yml @@ -23,21 +23,21 @@ jobs: VERSION=$(echo $RELEASE_DATA | jq -r .tag_name) X86_URL=$(echo $RELEASE_DATA | jq -r '.assets[] | select(.name | contains("linux-x64.zip")) | .browser_download_url') AARCH64_URL=$(echo $RELEASE_DATA | jq -r '.assets[] | select(.name | contains("linux-arm64.zip")) | .browser_download_url') - echo "::set-output name=version::$VERSION" - echo "::set-output name=x86_url::$X86_URL" - echo "::set-output name=aarch64_url::$AARCH64_URL" + echo "version=${VERSION}" >> $GITHUB_STATE + echo "x86_url=${X86_URL}" >> $GITHUB_STATE + echo "aarch64_url=${AARCH64_URL}" >> $GITHUB_STATE - name: Generate SHA256 checksum for x86_64 release id: sha256_x86 run: | CHECKSUM=$(curl -L ${{ steps.get_release.outputs.x86_url }} | sha256sum | awk '{ print $1 }') - echo "::set-output name=x86_64_sha256::$CHECKSUM" + echo "x86_64_sha256=${CHECKSUM}" >> $GITHUB_STATE - name: Generate SHA256 checksum for aarch64 release id: sha256_arm run: | CHECKSUM=$(curl -L ${{ steps.get_release.outputs.aarch64_url }} | sha256sum | awk '{ print $1 }') - echo "::set-output name=aarch64_sha256::$CHECKSUM" + echo "aarch64_sha256=${CHECKSUM}" >> $GITHUB_STATE - name: Update manifest file with new version and checksums run: | @@ -48,6 +48,11 @@ jobs: yq eval -i ".modules[0].sources[1].url = \"${{ steps.get_release.outputs.aarch64_url }}\"" $MANIFEST_FILE yq eval -i ".modules[0].sources[1].sha256 = \"${{ steps.sha256_arm.outputs.aarch64_sha256 }}\"" $MANIFEST_FILE + - name: Set Git user identity + run: | + git config --global user.name "WardPearce" + git config --global user.email "wardpearce@pm.me" + - name: Create Release Branch run: | git checkout -b release-v${{ steps.get_release.outputs.version }} diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 536d07c1..bfed9fd0 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 93 - versionName "1.7.11" + versionCode 94 + versionName "1.7.12" 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 3273fd90..7ac31451 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -54,7 +54,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.7.12 + + https://github.com/Materialious/Materialious/releases/tag/1.7.11 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index b298db55..8eab6ada 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.7.11", + "version": "1.7.12", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 7c0b6768..2c9c3c63 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.7.11", + "version": "1.7.12", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 769ec3f4..1a9fedbb 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.11" +LATEST_VERSION = "1.7.12" 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")