Skip to content

Commit f07afab

Browse files
committed
Merge branch 'development' into feature/windows/settings-in-same-folder
* development: (325 commits) Replace vue-portal dependency with Vue's built-in <Teleport> component (FreeTubeApp#8207) Update to Vue 3 (FreeTubeApp#8094) Translated using Weblate (Basque) Translated using Weblate (Hungarian) Translated using Weblate (Icelandic) Translated using Weblate (Turkish) Properly fix CORS in PO token web views (FreeTubeApp#8203) Translated using Weblate (Italian) Translated using Weblate (Norwegian Bokmål) Translated using Weblate (French) Configure nedb to always clean up corrupted data (FreeTubeApp#8202) Translated using Weblate (Portuguese (Brazil)) Add video paused check to frame shortcuts (FreeTubeApp#8200) Fix toast with timeout 0 will be displayed for default 3s (FreeTubeApp#8168) Translated using Weblate (Chinese (Simplified Han script)) Change containing text input limit (FreeTubeApp#8174) Translated using Weblate (Dutch) Add support for AppImageUpdate (FreeTubeApp#8153) Added New Window option to Tray (FreeTubeApp#7995) Translated using Weblate (Japanese) ...
2 parents e666087 + 4c72a23 commit f07afab

File tree

223 files changed

+11888
-10949
lines changed

Some content is hidden

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

223 files changed

+11888
-10949
lines changed

.github/workflows/build.yml

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,28 @@ 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@v6
5757
with:
5858
node-version: ${{ matrix.node-version }}
5959
cache: "yarn"
6060
- run: yarn run ci
61+
env:
62+
ELECTRON_SKIP_BINARY_DOWNLOAD: '1'
6163
- run: yarn run lint
6264
- name: Get Version Number
6365
id: getPackageInfo
6466
uses: jaywcjlove/github-action-package@main
6567

6668
- name: Set Version Number Variable
6769
id: versionNumber
68-
uses: actions/github-script@v7
70+
uses: actions/github-script@v8
6971
env:
7072
IS_DEV: ${{ contains(github.ref, 'development') }}
7173
IS_RC: ${{ contains(github.ref, 'RC') }}
@@ -119,91 +121,91 @@ jobs:
119121
rm -rf ./squashfs-root ./appimagetool.AppImage
120122
121123
- name: Upload Linux .zip x64 Artifact
122-
uses: actions/upload-artifact@v4
124+
uses: actions/upload-artifact@v5
123125
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
124126
with:
125127
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.zip
126128
path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip
127129

128130
- name: Upload Linux .7z x64 Artifact
129-
uses: actions/upload-artifact@v4
131+
uses: actions/upload-artifact@v5
130132
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
131133
with:
132134
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.7z
133135
path: build/freetube-${{ steps.versionNumber.outputs.result }}.7z
134136

135137
- name: Upload Linux .zip ARMv7l Artifact
136-
uses: actions/upload-artifact@v4
138+
uses: actions/upload-artifact@v5
137139
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
138140
with:
139141
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.zip
140142
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip
141143

142144
- name: Upload Linux .7z ARMv7l Artifact
143-
uses: actions/upload-artifact@v4
145+
uses: actions/upload-artifact@v5
144146
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
145147
with:
146148
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.7z
147149
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.7z
148150

149151
- name: Upload Linux .zip ARM64 Artifact
150-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v5
151153
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
152154
with:
153155
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.zip
154156
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip
155157

156158
- name: Upload Linux .7z ARM64 Artifact
157-
uses: actions/upload-artifact@v4
159+
uses: actions/upload-artifact@v5
158160
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
159161
with:
160162
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.7z
161163
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.7z
162164

163165
- name: Upload .deb x64 Artifact
164-
uses: actions/upload-artifact@v4
166+
uses: actions/upload-artifact@v5
165167
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
166168
with:
167169
name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
168170
path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
169171

170172
- name: Upload .deb ARMv7l Artifact
171-
uses: actions/upload-artifact@v4
173+
uses: actions/upload-artifact@v5
172174
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
173175
with:
174176
name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
175177
path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
176178

177179
- name: Upload .deb ARM64 Artifact
178-
uses: actions/upload-artifact@v4
180+
uses: actions/upload-artifact@v5
179181
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
180182
with:
181183
name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
182184
path: build/freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
183185

184186
- name: Upload AppImage x64 Artifact
185-
uses: actions/upload-artifact@v4
187+
uses: actions/upload-artifact@v5
186188
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
187189
with:
188190
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.AppImage
189191
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage
190192

191193
- name: Upload AppImage ARMv7l Artifact
192-
uses: actions/upload-artifact@v4
194+
uses: actions/upload-artifact@v5
193195
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
194196
with:
195197
name: freetube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
196198
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
197199

198200
- name: Upload AppImage ARM64 Artifact
199-
uses: actions/upload-artifact@v4
201+
uses: actions/upload-artifact@v5
200202
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
201203
with:
202204
name: freetube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
203205
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
204206

205207
- name: Upload .rpm x64 Artifact
206-
uses: actions/upload-artifact@v4
208+
uses: actions/upload-artifact@v5
207209
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
208210
with:
209211
name: freetube-${{ steps.versionNumber.outputs.result }}.amd64.rpm
@@ -212,119 +214,119 @@ jobs:
212214
# rpm are not built for armv7l
213215

214216
- name: Upload .rpm ARM64 Artifact
215-
uses: actions/upload-artifact@v4
217+
uses: actions/upload-artifact@v5
216218
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
217219
with:
218220
name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
219221
path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
220222

221223
- name: Upload Pacman .pacman x64 Artifact
222-
uses: actions/upload-artifact@v4
224+
uses: actions/upload-artifact@v5
223225
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
224226
with:
225227
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.pacman
226228
path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman
227229

228230
# - name: Upload Web Build
229-
# uses: actions/upload-artifact@v4
231+
# uses: actions/upload-artifact@v5
230232
# if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
231233
# with:
232234
# name: freetube-${{ steps.versionNumber.outputs.result }}-static-web
233235
# path: dist/web
234236

235237
- name: Upload Windows x64 .exe Artifact
236-
uses: actions/upload-artifact@v4
238+
uses: actions/upload-artifact@v5
237239
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
238240
with:
239241
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
240242
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
241243

242244
- name: Upload Windows x64 Portable Artifact
243-
uses: actions/upload-artifact@v4
245+
uses: actions/upload-artifact@v5
244246
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
245247
with:
246248
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
247249
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
248250

249251
- name: Upload Windows x64 .zip Artifact
250-
uses: actions/upload-artifact@v4
252+
uses: actions/upload-artifact@v5
251253
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
252254
with:
253255
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.zip
254256
path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip
255257

256258
- name: Upload Windows x64 .7z Artifact
257-
uses: actions/upload-artifact@v4
259+
uses: actions/upload-artifact@v5
258260
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
259261
with:
260262
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
261263
path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z
262264

263265
- name: Upload Windows arm64 .exe Artifact
264-
uses: actions/upload-artifact@v4
266+
uses: actions/upload-artifact@v5
265267
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
266268
with:
267269
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
268270
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
269271

270272
- name: Upload Windows arm64 Portable Artifact
271-
uses: actions/upload-artifact@v4
273+
uses: actions/upload-artifact@v5
272274
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
273275
with:
274276
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
275277
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
276278

277279
- name: Upload Windows arm64 .zip Artifact
278-
uses: actions/upload-artifact@v4
280+
uses: actions/upload-artifact@v5
279281
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
280282
with:
281283
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
282284
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
283285

284286
- name: Upload Windows arm64 .7z Artifact
285-
uses: actions/upload-artifact@v4
287+
uses: actions/upload-artifact@v5
286288
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
287289
with:
288290
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
289291
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
290292

291293
- name: Upload Mac x64 .dmg Artifact
292-
uses: actions/upload-artifact@v4
294+
uses: actions/upload-artifact@v5
293295
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
294296
with:
295297
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
296298
path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
297299

298300
- name: Upload Mac x64 .zip Artifact
299-
uses: actions/upload-artifact@v4
301+
uses: actions/upload-artifact@v5
300302
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
301303
with:
302304
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
303305
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip
304306

305307
- name: Upload Mac x64 .7z Artifact
306-
uses: actions/upload-artifact@v4
308+
uses: actions/upload-artifact@v5
307309
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
308310
with:
309311
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
310312
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
311313

312314
- name: Upload Mac arm64 .dmg Artifact
313-
uses: actions/upload-artifact@v4
315+
uses: actions/upload-artifact@v5
314316
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
315317
with:
316318
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
317319
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
318320

319321
- name: Upload Mac arm64 .zip Artifact
320-
uses: actions/upload-artifact@v4
322+
uses: actions/upload-artifact@v5
321323
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
322324
with:
323325
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
324326
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
325327

326328
- name: Upload Mac arm64 .7z Artifact
327-
uses: actions/upload-artifact@v4
329+
uses: actions/upload-artifact@v5
328330
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
329331
with:
330332
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z

.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ 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
34-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@v4
3535
with:
3636
languages: ${{ matrix.language }}
3737
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
4444
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4545
# If this step fails, then you should remove it and run the build manually (see below)
4646
- name: Autobuild
47-
uses: github/codeql-action/autobuild@v3
47+
uses: github/codeql-action/autobuild@v4
4848

4949
# ℹ️ Command-line programs to run using the OS shell.
5050
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -57,6 +57,6 @@ jobs:
5757
# ./location_of_script_within_repo/buildscript.sh
5858

5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@v3
60+
uses: github/codeql-action/analyze@v4
6161
with:
6262
category: "/language:${{matrix.language}}"

.github/workflows/flatpak.yml

Lines changed: 6 additions & 6 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/yq@v4.47.1
79+
uses: mikefarah/yq@v4.48.1
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/yq@v4.47.1
84+
uses: mikefarah/yq@v4.48.1
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/yq@v4.47.1
89+
uses: mikefarah/yq@v4.48.1
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/yq@v4.47.1
94+
uses: mikefarah/yq@v4.48.1
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
@@ -102,7 +102,7 @@ jobs:
102102
rm freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip
103103
rm freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip
104104
- name: Commit Files
105-
uses: stefanzweifel/git-auto-commit-action@v6
105+
uses: stefanzweifel/git-auto-commit-action@v7
106106
with:
107107
# Optional but recommended
108108
# Defaults to "Apply automatic changes"

.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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ 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@v6
2323
with:
2424
node-version: 22.x
2525
cache: "yarn"
2626
- run: yarn run ci
27+
env:
28+
ELECTRON_SKIP_BINARY_DOWNLOAD: '1'
2729
- run: yarn run lint
2830
# let's verify that webpack is able to package the project
2931
- run: yarn run pack

0 commit comments

Comments
 (0)