diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 4b14a7ef..842d23d0 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -5,7 +5,6 @@ on: - 'main' paths-ignore: - '**/README.md' - - 'flatpak/**' permissions: contents: write diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index 25d8d902..a80ffaf0 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -5,7 +5,6 @@ on: branches: [ main ] paths-ignore: - '**/README.md' - - 'flatpak/**' workflow_dispatch: @@ -66,4 +65,13 @@ jobs: if: runner.os == 'Windows' - name: Build desktop packages - run: cd ./materialious/electron && npm run electron:make \ No newline at end of file + run: cd ./materialious/electron && npm run electron:make + + - name: Upload Snap to Snapcraft + if: matrix.runtime == 'linux-x64' + uses: snapcore/action-publish@v1 + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_LOGIN }} + with: + snap: ./materialious/electron/dist/*.snap + release: stable \ No newline at end of file diff --git a/.github/workflows/prod-web.yml b/.github/workflows/prod-web.yml index 015f544e..63a313ed 100644 --- a/.github/workflows/prod-web.yml +++ b/.github/workflows/prod-web.yml @@ -6,7 +6,6 @@ on: - main paths-ignore: - '**/README.md' - - 'flatpak/**' jobs: web-build: diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index f438175c..abf28e0f 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 69 - versionName "1.6.18" + versionCode 70 + versionName "1.6.19" 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 daff7e18..9b484fb4 100644 --- a/materialious/electron/electron-builder.config.json +++ b/materialious/electron/electron-builder.config.json @@ -96,6 +96,12 @@ "x64", "arm64" ] + }, + { + "target": "snap", + "arch": [ + "x64" + ] } ], "category": "AudioVideo" diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 5f45ee7d..fef380e2 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.18", + "version": "1.6.19", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index d459c96e..f3bb4474 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.18", + "version": "1.6.19", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 48c51f7c..2dbdbcc6 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.18" +LATEST_VERSION = "1.6.19" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")