tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix channel banners and temporarily remove RPM for testing

This commit is contained in:
Preston 2020-07-16 23:14:26 -04:00
parent 69101aba2f
commit a460fd08ce
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.github/workflows/build.yml vendored
View File

@ -49,34 +49,34 @@ jobs:
with:
name: freetube-vue_0.8.0_static_web
path: dist/web
# - name: Build on ARMv7
# uses: uraimo/run-on-arch-action@v1.0.9
# if: startsWith(matrix.os, 'ubuntu')
# with:
# architecture: aarch64
# distribution: ubuntu20.04
# run: |
# export DEBIAN_FRONTEND=noninteractive
# export TZ=Europe/Kiev
# apt update
# apt install -y curl
# echo 'installing node 12x'
# curl -sL https://deb.nodesource.com/setup_12.x | bash
# echo 'finished installing node'
# apt update
# apt install -y nodejs
# apt install -y build-essential
# apt install -y libopenjp2-7
# node --version
# npm install
# npm run lint
# npm run build --if-present
# - name: Upload Linux ARM64 .deb Artifact
# uses: actions/upload-artifact@v2
# if: startsWith(matrix.os, 'ubuntu-latest')
# with:
# name: freetube-vue_0.8.0_arm64.deb
# path: build/freetube-vue_0.8.0_arm64.deb
- name: Build on ARMv7
uses: uraimo/run-on-arch-action@v1.0.9
if: startsWith(matrix.os, 'ubuntu')
with:
architecture: aarch64
distribution: ubuntu20.04
run: |
export DEBIAN_FRONTEND=noninteractive
export TZ=Europe/Kiev
apt update
apt install -y curl
echo 'installing node 12x'
curl -sL https://deb.nodesource.com/setup_12.x | bash
echo 'finished installing node'
apt update
apt install -y nodejs
apt install -y build-essential
apt install -y libopenjp2-7
node --version
npm install
npm run lint
npm run build --if-present
- name: Upload Linux ARM64 .deb Artifact
uses: actions/upload-artifact@v2
if: startsWith(matrix.os, 'ubuntu-latest')
with:
name: freetube-vue_0.8.0_arm64.deb
path: build/freetube-vue_0.8.0_arm64.deb
- name: Upload Windows .exe Artifact
uses: actions/upload-artifact@v2
if: startsWith(matrix.os, 'windows')

2
_scripts/build.js
View File

@ -47,7 +47,7 @@ const config = {
linux: {
category: 'Network',
icon: '_icons/icon.png',
target: ['deb', 'rpm', 'zip', 'AppImage'],
target: ['deb', 'zip', 'AppImage'], // re-add RPM after testiing
},
mac: {
category: 'public.app-category.utilities',

8
src/renderer/views/Channel/Channel.js
View File

@ -178,7 +178,13 @@ export default Vue.extend({
this.relatedChannels = response.relatedChannels
if (response.authorBanners !== null) {
this.bannerUrl = `https://${response.authorBanners[response.authorBanners.length - 1].url}`
const bannerUrl = response.authorBanners[response.authorBanners.length - 1].url
if (!bannerUrl.includes('https')) {
this.bannerUrl = `https://${bannerUrl}`
} else {
this.bannerUrl = bannerUrl
}
} else {
this.bannerUrl = null
}