Skip to content

Commit 5ee3bf6

Browse files
PikachuEXEPikachuEXE
committed
Merge branch 'development' into custom-builds/tmp
* development: (96 commits) Move Invidious API calls into Invidious file (FreeTubeApp#6313) Translated using Weblate (Spanish) Use word-break on live chat error message (FreeTubeApp#6327) Bump youtubei.js from 11.0.1 to 12.0.0 (FreeTubeApp#6323) Bump shaka-player from 4.12.3 to 4.12.4 (FreeTubeApp#6318) Make seekbar and player controls appear at bottom of video and take full width (FreeTubeApp#6007) Fix 'Object has been destroyed' when FreeTube is passed a URL with no windows open on macOS (FreeTubeApp#6278) Bump mikefarah/yq from 4.44.5 to 4.44.6 (FreeTubeApp#6324) Translated using Weblate (French) Bump sass-loader from 16.0.3 to 16.0.4 (FreeTubeApp#6319) Bump webpack from 5.96.1 to 5.97.1 (FreeTubeApp#6322) Bump sass from 1.81.0 to 1.82.0 (FreeTubeApp#6320) Bump lefthook from 1.8.5 to 1.9.0 (FreeTubeApp#6321) Bump @intlify/eslint-plugin-vue-i18n from 3.1.0 to 3.2.0 (FreeTubeApp#6317) Translated using Weblate (Estonian) Translated using Weblate (Basque) Translated using Weblate (Icelandic) Translated using Weblate (Hungarian) Translated using Weblate (German) Fix channel home page list view (FreeTubeApp#6316) ...
2 parents e013a43 + ad7c19d commit 5ee3bf6

File tree

108 files changed

+2267
-1262
lines changed

Some content is hidden

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

108 files changed

+2267
-1262
lines changed

‎.github/workflows/build.yml

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
- win-x64
2121
- win-arm64
2222
- osx-x64
23-
# `osx-arm64` disabled due to "macOS gatekeeper"
24-
# See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
25-
# - osx-arm64
23+
- osx-arm64
2624
include:
2725
- runtime: linux-x64
2826
os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
3634
- runtime: osx-x64
3735
os: macOS-latest
3836

39-
# - runtime: osx-arm64
40-
# os: macOS-latest
37+
- runtime: osx-arm64
38+
os: macOS-latest
4139

4240
- runtime: win-x64
4341
os: windows-latest
@@ -102,6 +100,19 @@ jobs:
102100
if: contains(matrix.runtime, 'arm64')
103101
run: yarn run build:arm64
104102

103+
- name: Convert X64 AppImage to static runtime
104+
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
105+
run: |
106+
sudo apt install desktop-file-utils
107+
cd build
108+
appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
109+
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
110+
chmod +x ./"$appimage" ./appimagetool.AppImage
111+
./"$appimage" --appimage-extract && rm -f ./"$appimage"
112+
./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
113+
-n ./squashfs-root ./"$appimage"
114+
rm -rf ./squashfs-root ./appimagetool.AppImage
115+
105116
- name: Upload Linux .zip x64 Artifact
106117
uses: actions/upload-artifact@v4
107118
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -300,12 +311,12 @@ jobs:
300311
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
301312
path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
302313

303-
# - name: Upload Mac arm64 .dmg Artifact
304-
# uses: actions/upload-artifact@v4
305-
# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
306-
# with:
307-
# name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
308-
# path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
314+
- name: Upload Mac arm64 .dmg Artifact
315+
uses: actions/upload-artifact@v4
316+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
317+
with:
318+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
319+
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
309320

310321
- name: Upload Mac x64 .zip Artifact
311322
uses: actions/upload-artifact@v4
@@ -321,9 +332,16 @@ jobs:
321332
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
322333
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
323334

324-
# - name: Upload Mac arm64 .zip Artifact
325-
# uses: actions/upload-artifact@v4
326-
# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
327-
# with:
328-
# name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
329-
# path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
335+
- name: Upload Mac arm64 .zip Artifact
336+
uses: actions/upload-artifact@v4
337+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
338+
with:
339+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
340+
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
341+
342+
- name: Upload Mac arm64 .7z Artifact
343+
uses: actions/upload-artifact@v4
344+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
345+
with:
346+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
347+
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z

‎.github/workflows/flatpak.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,22 @@ jobs:
7777
date +"%Y-%m-%d" >> $GITHUB_ENV
7878
echo 'EOF' >> $GITHUB_ENV
7979
- name: Update x64 File Location in yml File
80-
uses: mikefarah/[email protected].5
80+
uses: mikefarah/[email protected].6
8181
with:
8282
# The Command which should be run
8383
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 }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
8484
- name: Update x64 Hash in yml File
85-
uses: mikefarah/[email protected].5
85+
uses: mikefarah/[email protected].6
8686
with:
8787
# The Command which should be run
8888
cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
8989
- name: Update ARM File Location in yml File
90-
uses: mikefarah/[email protected].5
90+
uses: mikefarah/[email protected].6
9191
with:
9292
# The Command which should be run
9393
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 }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
9494
- name: Update ARM Hash in yml File
95-
uses: mikefarah/[email protected].5
95+
uses: mikefarah/[email protected].6
9696
with:
9797
# The Command which should be run
9898
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

‎.github/workflows/no-response.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
This issue has been automatically closed because there has been no response to our request for more information from the original author.
2121
With only the information that is currently in the issue, we don't have enough information to take action.
2222
Please reach out if you have or find the answers we need so that we can investigate further.
23-
daysUntilClose: 14
23+
daysUntilClose: 7
2424
responseRequiredLabel: "U: Waiting for Response from Author"

‎.github/workflows/release.yml

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
- win-x64
2121
- win-arm64
2222
- osx-x64
23-
# `osx-arm64` disabled due to "macOS gatekeeper"
24-
# See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
25-
# - osx-arm64
23+
- osx-arm64
2624
include:
2725
- runtime: linux-x64
2826
os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
3634
- runtime: osx-x64
3735
os: macOS-latest
3836

39-
# - runtime: osx-arm64
40-
# os: macOS-latest
37+
- runtime: osx-arm64
38+
os: macOS-latest
4139

4240
- runtime: win-x64
4341
os: windows-latest
@@ -73,6 +71,19 @@ jobs:
7371
if: contains(matrix.runtime, 'arm64')
7472
run: yarn run build:arm64
7573

74+
- name: Convert X64 AppImage to static runtime
75+
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
76+
run: |
77+
sudo apt install desktop-file-utils
78+
cd build
79+
appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
80+
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
81+
chmod +x ./"$appimage" ./appimagetool.AppImage
82+
./"$appimage" --appimage-extract && rm -f ./"$appimage"
83+
./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
84+
-n ./squashfs-root ./"$appimage"
85+
rm -rf ./squashfs-root ./appimagetool.AppImage
86+
7687
- name: Upload AppImage x64 Release
7788
uses: actions/upload-release-asset@v1
7889
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -306,16 +317,16 @@ jobs:
306317
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
307318
asset_content_type: application/x-apple-diskimage
308319

309-
# - name: Upload Mac arm64 .dmg Release
310-
# uses: actions/upload-release-asset@v1
311-
# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
312-
# env:
313-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
314-
# with:
315-
# upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
316-
# asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
317-
# asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
318-
# asset_content_type: application/x-apple-diskimage
320+
- name: Upload Mac arm64 .dmg Release
321+
uses: actions/upload-release-asset@v1
322+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
323+
env:
324+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
325+
with:
326+
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
327+
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
328+
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
329+
asset_content_type: application/x-apple-diskimage
319330

320331
- name: Upload Mac x64 .zip Release
321332
uses: actions/upload-release-asset@v1
@@ -339,13 +350,24 @@ jobs:
339350
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
340351
asset_content_type: application/x-7z-compressed
341352

342-
# - name: Upload Mac arm64 .zip Release
343-
# uses: actions/upload-release-asset@v1
344-
# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
345-
# env:
346-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
347-
# with:
348-
# upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
349-
# asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
350-
# asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
351-
# asset_content_type: application/x-apple-diskimage
353+
- name: Upload Mac arm64 .zip Release
354+
uses: actions/upload-release-asset@v1
355+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
356+
env:
357+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
358+
with:
359+
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
360+
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
361+
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
362+
asset_content_type: application/x-apple-diskimage
363+
364+
- name: Upload Mac arm64 .7z Release
365+
uses: actions/upload-release-asset@v1
366+
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
367+
env:
368+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
369+
with:
370+
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
371+
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
372+
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.7z
373+
asset_content_type: application/x-7z-compressed

‎.github/workflows/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
- uses: actions/stale@v9
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.'
17-
stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
17+
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.'
1818
close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
1919
close-pr-message: 'This PR was closed because it has been stalled for 14 days with no activity.'
2020
days-before-issue-stale: 28
21-
days-before-pr-stale: 28
21+
days-before-pr-stale: 14
2222
days-before-issue-close: 7
2323
days-before-pr-close: 14
2424
stale-issue-label: 'U: stale'
2525
stale-pr-label: 'PR: stale'
2626
exempt-pr-labels: 'PR: WIP'
27-
exempt-issue-labels: 'enhancement'
27+
exempt-issue-labels: 'enhancement, U: reproduced'

‎_icons/iconGruvboxDarkSmall.svg

Lines changed: 1 addition & 4 deletions
Loading

‎_icons/iconGruvboxLightSmall.svg

Lines changed: 1 addition & 4 deletions
Loading

0 commit comments

Comments
 (0)