Skip to content

Commit 6028c1b

Browse files
authored
Merge branch 'FreeTubeApp:development' into playbackrate
2 parents 0b541d0 + 861aede commit 6028c1b

File tree

122 files changed

+3837
-5805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+3837
-5805
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
runs-on: ${{ matrix.os }}
4747

4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050

5151
- name: 'Use faster D: drive for yarn cache on Windows'
5252
if: startsWith(matrix.os, 'windows')
5353
run: yarn config set cache-folder D:\ft_yarn_cache
5454

5555
- name: Use Node.js ${{ matrix.node-version }}
56-
uses: actions/setup-node@v4
56+
uses: actions/setup-node@v5
5757
with:
5858
node-version: ${{ matrix.node-version }}
5959
cache: "yarn"
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Set Version Number Variable
6767
id: versionNumber
68-
uses: actions/github-script@v7
68+
uses: actions/github-script@v8
6969
env:
7070
IS_DEV: ${{ contains(github.ref, 'development') }}
7171
IS_RC: ${{ contains(github.ref, 'RC') }}

.github/workflows/calibreapp-image-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout Repo
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Compress Images
1616
id: calibre
1717
uses: calibreapp/image-actions@main

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL

.github/workflows/flatpak.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
repository: flathub/io.freetubeapp.FreeTube
2121
token: ${{ secrets.FLATHUB_TOKEN }}
@@ -76,22 +76,22 @@ jobs:
7676
date +"%Y-%m-%d" >> $GITHUB_ENV
7777
echo 'EOF' >> $GITHUB_ENV
7878
- name: Update x64 File Location in yml File
79-
uses: mikefarah/[email protected].1
79+
uses: mikefarah/[email protected].2
8080
with:
8181
# The Command which should be run
8282
cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
8383
- name: Update x64 Hash in yml File
84-
uses: mikefarah/[email protected].1
84+
uses: mikefarah/[email protected].2
8585
with:
8686
# The Command which should be run
8787
cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
8888
- name: Update ARM File Location in yml File
89-
uses: mikefarah/[email protected].1
89+
uses: mikefarah/[email protected].2
9090
with:
9191
# The Command which should be run
9292
cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
9393
- name: Update ARM Hash in yml File
94-
uses: mikefarah/[email protected].1
94+
uses: mikefarah/[email protected].2
9595
with:
9696
# The Command which should be run
9797
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

.github/workflows/label-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ !github.event.pull_request.draft }}
1313
steps:
14-
- uses: actions/labeler@v5
14+
- uses: actions/labeler@v6
1515
with:
1616
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1717
configuration-path: .github/pr-labeler.yml

.github/workflows/linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717

1818
# Steps represent a sequence of tasks that will be executed as part of the job
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Use Node.js 22.x
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
2424
node-version: 22.x
2525
cache: "yarn"

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
runs-on: ${{ matrix.os }}
5252

5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555

5656
- name: 'Use faster D: drive for yarn cache on Windows'
5757
if: startsWith(matrix.os, 'windows')
5858
run: yarn config set cache-folder D:\ft_yarn_cache
5959

6060
- name: Use Node.js ${{ matrix.node-version }}
61-
uses: actions/setup-node@v4
61+
uses: actions/setup-node@v5
6262
with:
6363
node-version: ${{ matrix.node-version }}
6464
cache: "yarn"

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
stale:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/stale@v9
14+
- uses: actions/stale@v10
1515
with:
1616
stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
1717
stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'

.github/workflows/updateSite.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This is a basic workflow that is manually triggered
2+
3+
name: Update Site Version Number
4+
5+
# Controls when the action will run. Workflow runs when manually triggered using the UI
6+
# or API.
7+
on:
8+
workflow_dispatch:
9+
release:
10+
types: [published]
11+
12+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v5
19+
with:
20+
repository: FreeTubeApp/FreeTubeApp.io
21+
token: ${{ secrets.FLATHUB_TOKEN }}
22+
- name: Get Repo Release List
23+
uses: moustacheful/github-api-exec-action@v0
24+
id: list_results
25+
with:
26+
# Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
27+
command: repos.listReleases
28+
payload: >
29+
{
30+
"owner": "FreeTubeApp",
31+
"repo": "FreeTube"
32+
}
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
- name: Create Current Version Variable
36+
uses: bluwy/substitute-string-action@v3
37+
id: current
38+
with:
39+
_input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
40+
-beta: ''
41+
v: ''
42+
- name: Create Previous Version Variable
43+
uses: bluwy/substitute-string-action@v3
44+
id: previous
45+
with:
46+
_input-text: ${{ fromJson(steps.list_results.outputs.result)[1].tag_name }}
47+
-beta: ''
48+
v: ''
49+
- name: Set Master Branch
50+
# Currently the default branch is master, but if that changes later, then this acts as a failsafe.
51+
run: |
52+
git checkout master
53+
- name: Update index.php
54+
run: |
55+
sed -i 's/${{ steps.previous.outputs.result }}/${{ steps.current.outputs.result }}/g' src/index.php
56+
- name: Commit Files
57+
uses: stefanzweifel/git-auto-commit-action@v6
58+
with:
59+
# Optional but recommended
60+
# Defaults to "Apply automatic changes"
61+
commit_message: Update version number to v${{ steps.current.outputs.result }}
62+
63+
# Optional options appended to `git-commit`
64+
# See https://git-scm.com/docs/git-commit for a list of available options
65+
commit_options: '--no-verify --signoff'
66+
67+
# Optional: Disable dirty check and always try to create a commit and push
68+
skip_dirty_check: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The first build with a green check mark is the latest build.
125125

126126
* FreeTubeAndroid (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeAndroid/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeAndroid)
127127

128-
* Homebrew Formulae (Mac only): [Download](https://formulae.brew.sh/cask/freetube)
128+
* Homebrew Formulae (Mac only): [Download for Apple Silicon](https://github.com/PikachuEXE/homebrew-FreeTube)
129129

130130
* makedeb Package Repository (MPR): [Download](https://mpr.makedeb.org/packages/freetube-bin)
131131

0 commit comments

Comments
 (0)