Merge branch 'master' of github.com:AnonymusRaccoon/Kyoo into library

This commit is contained in:
Zoe Roux 2021-04-18 21:37:12 +02:00
commit ecb728bd56
5 changed files with 30 additions and 15 deletions

View File

@ -1,11 +1,5 @@
name: Analysis name: Analysis
on: on: [push, pull_request]
push:
branches:
- master
pull_request:
branches:
- master
jobs: jobs:
build: build:

View File

@ -1,14 +1,11 @@
name: Build name: Build
on: [push, pull_request]
on:
push:
branches:
- master
jobs: jobs:
build: build:
name: "${{matrix.artifact}}'s Build" name: "${{matrix.artifact}}'s Build"
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -77,6 +74,7 @@ jobs:
name: Create debian, rpm & arch releases name: Create debian, rpm & arch releases
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build needs: build
if: github.ref == 'refs/heads/master'
env: env:
description: "A media browser" description: "A media browser"
version: v0.0.1 #${{ github.ref }} version: v0.0.1 #${{ github.ref }}

20
.github/workflows/docker.yml vendored Normal file
View File

@ -0,0 +1,20 @@
name: Docker
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v2
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Push to GitHub Packages
uses: docker/build-push-action@v2
with:
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}
registry: docker.pkg.github.com
repository: AnonymusRaccoon/Kyoo/kyoo
tag_with_sha: true

View File

@ -11,6 +11,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set commit environment
run: echo "COMMIT_SHA=$(git rev-list -n 1 ${{github.ref}})" >> $GITHUB_ENV
- name: Wait for builds & tests to finish - name: Wait for builds & tests to finish
uses: lewagon/wait-on-check-action@v0.2 uses: lewagon/wait-on-check-action@v0.2
with: with:
@ -24,7 +26,7 @@ jobs:
- name: Download artifacts - name: Download artifacts
uses: dawidd6/action-download-artifact@v2 uses: dawidd6/action-download-artifact@v2
with: with:
commit: ${{github.ref}} commit: ${{env.COMMIT_SHA}}
workflow: build.yml workflow: build.yml
path: ./artifacts path: ./artifacts
github_token: ${{secrets.GITHUB_TOKEN}} github_token: ${{secrets.GITHUB_TOKEN}}

View File

@ -1,7 +1,7 @@
FROM gcc:latest as transcoder FROM gcc:latest as transcoder
RUN apt-get update && apt-get install -y cmake make RUN apt-get update && apt-get install -y cmake make libavutil-dev libavcodec-dev libavformat-dev
WORKDIR /transcoder WORKDIR /transcoder
COPY transcoder . COPY Kyoo.Transcoder .
RUN cmake . && make -j RUN cmake . && make -j
FROM node:alpine as webapp FROM node:alpine as webapp
@ -15,6 +15,7 @@ COPY . .
RUN dotnet publish -c Release -o /opt/kyoo '-p:SkipWebApp=true;SkipTranscoder=true' RUN dotnet publish -c Release -o /opt/kyoo '-p:SkipWebApp=true;SkipTranscoder=true'
FROM mcr.microsoft.com/dotnet/aspnet:5.0 FROM mcr.microsoft.com/dotnet/aspnet:5.0
RUN apt-get update && apt-get install -y libavutil-dev libavcodec-dev libavformat-dev
EXPOSE 5000 EXPOSE 5000
COPY --from=builder /opt/kyoo /usr/lib/kyoo COPY --from=builder /opt/kyoo /usr/lib/kyoo
COPY --from=transcoder /transcoder/libtranscoder.so /usr/lib/kyoo COPY --from=transcoder /transcoder/libtranscoder.so /usr/lib/kyoo