Merge branch 'main' into update/1.8.0

This commit is contained in:
Ward
2025-05-01 12:33:53 +12:00
committed by GitHub
8 changed files with 43 additions and 40 deletions
+6 -6
View File
@@ -2,9 +2,9 @@ name: Build Android
on:
push:
branches: [ main ]
branches: [main]
paths-ignore:
- '**/README.md'
- "**/README.md"
workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 20
node-version: latest
- name: Install modules
run: cd ../ && npm install
@@ -40,9 +40,9 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
cache: 'gradle'
distribution: "zulu"
java-version: "17"
cache: "gradle"
- name: Build App
run: |
+11 -11
View File
@@ -2,9 +2,9 @@ name: Build desktop
on:
push:
branches: [ main ]
branches: [main]
paths-ignore:
- '**/README.md'
- "**/README.md"
workflow_dispatch:
@@ -15,7 +15,7 @@ jobs:
desktop-build:
strategy:
matrix:
node-version: [20]
node-version: [latest]
runtime:
- linux-x64
- linux-arm64
@@ -23,14 +23,14 @@ jobs:
- osx-x64
include:
- runtime: linux-x64
os: ubuntu-latest
- runtime: linux-arm64
os: ubuntu-latest
- runtime: osx-x64
os: macOS-latest
- runtime: win-x64
os: windows-latest
- runtime: linux-x64
os: ubuntu-latest
- runtime: linux-arm64
os: ubuntu-latest
- runtime: osx-x64
os: macOS-latest
- runtime: win-x64
os: windows-latest
runs-on: ${{ matrix.os }}
+5 -5
View File
@@ -2,7 +2,7 @@ name: Check Android
on:
pull_request:
branches: [ "main" ]
branches: ["main"]
permissions:
contents: write
@@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 20
node-version: latest
- name: Install modules
run: cd ../ && npm install
@@ -36,9 +36,9 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
cache: 'gradle'
distribution: "zulu"
java-version: "17"
cache: "gradle"
- name: Build App
run: |
+9 -9
View File
@@ -13,7 +13,7 @@ jobs:
desktop-check:
strategy:
matrix:
node-version: [20]
node-version: [latest]
runtime:
- linux-x64
- linux-arm64
@@ -21,14 +21,14 @@ jobs:
- osx-x64
include:
- runtime: linux-x64
os: ubuntu-latest
- runtime: linux-arm64
os: ubuntu-latest
- runtime: osx-x64
os: macOS-latest
- runtime: win-x64
os: windows-latest
- runtime: linux-x64
os: ubuntu-latest
- runtime: linux-arm64
os: ubuntu-latest
- runtime: osx-x64
os: macOS-latest
- runtime: win-x64
os: windows-latest
runs-on: ${{ matrix.os }}
+3 -3
View File
@@ -2,7 +2,7 @@ name: Check web
on:
pull_request:
branches: [ "main" ]
branches: ["main"]
jobs:
web-check:
@@ -15,10 +15,10 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: latest
- name: Install modules
run: npm install
- name: Check linting
run: npm run check
- name: Attempt to build codebase
run: npm run build
run: npm run build
@@ -65,9 +65,12 @@
<release version="1.8.0" date="2025-4-30">
<url>https://github.com/Materialious/Materialious/releases/tag/1.8.0</url>
</release>
<release version="1.8.0" date="2025-4-30">
<url>https://github.com/Materialious/Materialious/releases/tag/1.8.0</url>
</release>
<release version="1.7.22" date="2025-4-26">
<url>https://github.com/Materialious/Materialious/releases/tag/1.7.22</url>
</release>
<release version="1.7.21" date="2025-4-15">
<url>https://github.com/Materialious/Materialious/releases/tag/1.7.21</url>
</release>
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Materialious",
"version": "1.8.0",
"version": "1.8.0",
"description": "Modern material design for Invidious.",
"author": {
"name": "Ward Pearce",
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "materialious",
"version": "1.8.0",
"version": "1.8.0",
"private": true,
"scripts": {
"dev": "vite dev",
@@ -71,4 +71,4 @@
"terser": "^5.34.1",
"youtubei.js": "^13.4.0"
}
}
}