Skip to content

Commit ec6398d

Browse files
Merge pull request #7330 from FreeTubeApp/master-v0.23.5
[Master] Bump package version from 0.23.4 to 0.23.5
2 parents eddaa54 + 248f632 commit ec6398d

File tree

7 files changed

+12
-58
lines changed

7 files changed

+12
-58
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ body:
8282
label: Installation Method
8383
description: When you select an unofficial installation method, you must have verified that the bug is also present in one of the official installation methods. Please make sure you uninstall the unofficial installation before installing one of the official installations. If you can't reproduce this in one of the official installation methods, you should report the bug to the maintainer of the unofficial installation method you used.
8484
options:
85-
- .apk (Alpine Linux Package)
8685
- .AppImage
8786
- .deb
8887
- .dmg
@@ -93,6 +92,7 @@ body:
9392
- .rpm
9493
- .zip / .7z
9594
- .apk (FreeTubeAndroid Unofficial)
95+
- .apk (Alpine Linux Package Unofficial)
9696
- AUR (Unofficial)
9797
- Chocolatey (Unofficial)
9898
- Homebrew (Unofficial)

.github/workflows/build.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -213,27 +213,6 @@ jobs:
213213
name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
214214
path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
215215

216-
- name: Upload Alpine .apk x64 Artifact
217-
uses: actions/upload-artifact@v4
218-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
219-
with:
220-
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-amd64.apk
221-
path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk
222-
223-
- name: Upload Alpine .apk ARMv7l Artifact
224-
uses: actions/upload-artifact@v4
225-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
226-
with:
227-
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-armv7l.apk
228-
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.apk
229-
230-
- name: Upload Alpine .apk ARM64 Artifact
231-
uses: actions/upload-artifact@v4
232-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
233-
with:
234-
name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-arm64.apk
235-
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.apk
236-
237216
- name: Upload Pacman .pacman x64 Artifact
238217
uses: actions/upload-artifact@v4
239218
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')

.github/workflows/release.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -249,39 +249,6 @@ jobs:
249249
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.aarch64.rpm
250250
asset_content_type: application/x-rpm
251251

252-
- name: Upload Alpine .apk x64 Release
253-
uses: actions/upload-release-asset@v1
254-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
255-
env:
256-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
257-
with:
258-
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
259-
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-amd64.apk
260-
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.apk
261-
asset_content_type: application/octet-stream
262-
263-
- name: Upload Alpine .apk ARMv7l Release
264-
uses: actions/upload-release-asset@v1
265-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
266-
env:
267-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
268-
with:
269-
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
270-
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-armv7l.apk
271-
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.apk
272-
asset_content_type: application/octet-stream
273-
274-
- name: Upload Alpine .apk ARM64 Release
275-
uses: actions/upload-release-asset@v1
276-
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
277-
env:
278-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
279-
with:
280-
upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
281-
asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-arm64.apk
282-
asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.apk
283-
asset_content_type: application/octet-stream
284-
285252
- name: Upload Pacman .pacman x64 Release
286253
uses: actions/upload-release-asset@v1
287254
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')

_scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if (platform === 'darwin') {
3636
arch = Arch.armv7l
3737
}
3838

39-
targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
39+
targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
4040
}
4141

4242
builder

_scripts/ebuilder.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const config = {
4646
linux: {
4747
category: 'Network',
4848
icon: '_icons/icon.svg',
49-
target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
49+
target: ['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'],
5050
},
5151
// See the following issues for more information
5252
// https://github.com/jordansissel/fpm/issues/1503

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "freetube",
33
"productName": "FreeTube",
44
"description": "A private YouTube client",
5-
"version": "0.23.4",
5+
"version": "0.23.5",
66
"license": "AGPL-3.0-or-later",
77
"main": "./dist/main.js",
88
"private": true,

src/renderer/helpers/api/local.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,14 @@ export async function getLocalVideoInfo(id) {
225225

226226
const info = await webInnertube.getInfo(id)
227227

228+
// temporary workaround for SABR-only responses
229+
const mwebInfo = await webInnertube.getBasicInfo(id, 'MWEB')
230+
231+
if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data) {
232+
info.playability_status = mwebInfo.playability_status
233+
info.streaming_data = mwebInfo.streaming_data
234+
}
235+
228236
let hasTrailer = info.has_trailer
229237
let trailerIsAgeRestricted = info.getTrailerInfo() === null
230238

0 commit comments

Comments
 (0)