From 3256d5e6cc42ef1879e6640418ea23f0256c1a46 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 1 Apr 2021 23:57:35 +0200 Subject: [PATCH 1/9] Adding a debian and a rpm release --- .github/workflows/release.yml | 73 +++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d2c31f6..525c78ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,9 +4,14 @@ on: push: branches: - master + +env: + description: "A media browser" + version: beta #${{ github.ref }} jobs: build: + name: Builf for ${{matrix.artifact}} runs-on: ${{matrix.os}} strategy: matrix: @@ -33,4 +38,72 @@ jobs: - uses: actions/upload-artifact@v2 with: name: kyoo_${{matrix.artifact}} + + release: + name: Create debian & rpm releases + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v1 + - uses: actions/download-artifact@v2 + with: + name: kyoo_linux + path: dist + - name: Create the package structure + run: | + mkdir -p pkg/usr/lib/ + cp -r --no-preserve ownership dist/* pkg/usr/lib/kyoo + install -Dm 644 kyoo.service -t pkg/usr/lib/systemd/system/ + install -Dm 644 deployment/kyoo.sysusers pkg/usr/lib/sysusers.d/kyoo.conf + install -Dm 644 deployment/kyoo.tmpfiles pkg/usr/lib/tmpfiles.d/kyoo.conf + + - uses: jiro4989/build-deb-action@v2 + with: + package: kyoo + package_root: pkg + maintainer: Zoe Roux + version: ${{env.version}} + arch: amd64 + desc: ${{env.description}} + - uses: jiro4989/build-rpm-action@v2 + with: + package: kyoo + package_root: .pkg + maintainer: Zoe Roux + version: ${{env.version}} + arch: x86_64 + desc: ${{env.description}} + summary: ${{env.description}} + - uses: actions/upload-artifact@v2 + with: + name: artifact-deb + path: | + ./*.deb + - uses: actions/upload-artifact@v2 + with: + name: artifact-rpm + path: | + ./*.rpm + !./*-debuginfo-*.rpm + + + +# new-version: +# if: startsWith(github.ref, 'refs/tags/v') +# runs-on: ubuntu-latest + + + + + + + + + + + + + + + path: dist/* From 785de8969edc5c83ceac8886c3dbe7b73e94906e Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 1 Apr 2021 23:58:40 +0200 Subject: [PATCH 2/9] Fixing a typo in relase.yml --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 525c78ef..afee3ad6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,8 +55,7 @@ jobs: cp -r --no-preserve ownership dist/* pkg/usr/lib/kyoo install -Dm 644 kyoo.service -t pkg/usr/lib/systemd/system/ install -Dm 644 deployment/kyoo.sysusers pkg/usr/lib/sysusers.d/kyoo.conf - install -Dm 644 deployment/kyoo.tmpfiles pkg/usr/lib/tmpfiles.d/kyoo.conf - + install -Dm 644 deployment/kyoo.tmpfiles pkg/usr/lib/tmpfiles.d/kyoo.conf - uses: jiro4989/build-deb-action@v2 with: package: kyoo From f9e815017a6f2c0693d158d56995fd1666907888 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 00:08:31 +0200 Subject: [PATCH 3/9] Removing the garbage at the end of release.yml --- .github/workflows/release.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afee3ad6..b90ce5c1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,25 +84,8 @@ jobs: path: | ./*.rpm !./*-debuginfo-*.rpm - - # new-version: # if: startsWith(github.ref, 'refs/tags/v') -# runs-on: ubuntu-latest - - - - - - - - - - - - - - - - path: dist/* +# runs-on: ubuntu-latest + From e59365e2268a4a810b9e806d451c46b600e95291 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 00:48:18 +0200 Subject: [PATCH 4/9] Using env variables for the release job only --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b90ce5c1..9ea4bdbf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,10 +4,6 @@ on: push: branches: - master - -env: - description: "A media browser" - version: beta #${{ github.ref }} jobs: build: @@ -43,6 +39,9 @@ jobs: name: Create debian & rpm releases runs-on: ubuntu-latest needs: build + env: + description: "A media browser" + version: beta #${{ github.ref }} steps: - uses: actions/checkout@v1 - uses: actions/download-artifact@v2 From 4b28a4d0db2cd050bbbcb441f92ca8953c4fb287 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 01:00:31 +0200 Subject: [PATCH 5/9] Readding the path variable to the first upload. --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ea4bdbf..ec1c264e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: kyoo_${{matrix.artifact}} + path: dist/* release: name: Create debian & rpm releases From b635a9ae82848eb647a62efccc5bf41681fa395b Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 01:24:59 +0200 Subject: [PATCH 6/9] Fixing dist copy --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec1c264e..aca57db8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: - name: Create the package structure run: | mkdir -p pkg/usr/lib/ - cp -r --no-preserve ownership dist/* pkg/usr/lib/kyoo + cp -r --no-preserve ownership dist pkg/usr/lib/kyoo install -Dm 644 kyoo.service -t pkg/usr/lib/systemd/system/ install -Dm 644 deployment/kyoo.sysusers pkg/usr/lib/sysusers.d/kyoo.conf install -Dm 644 deployment/kyoo.tmpfiles pkg/usr/lib/tmpfiles.d/kyoo.conf From ad604fc708d7e37da24a42506af7523468e9cd01 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 02:00:13 +0200 Subject: [PATCH 7/9] Fixing wrong systemd path --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aca57db8..e28fc5bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: run: | mkdir -p pkg/usr/lib/ cp -r --no-preserve ownership dist pkg/usr/lib/kyoo - install -Dm 644 kyoo.service -t pkg/usr/lib/systemd/system/ + install -Dm 644 deployment/kyoo.service -t pkg/usr/lib/systemd/system/ install -Dm 644 deployment/kyoo.sysusers pkg/usr/lib/sysusers.d/kyoo.conf install -Dm 644 deployment/kyoo.tmpfiles pkg/usr/lib/tmpfiles.d/kyoo.conf - uses: jiro4989/build-deb-action@v2 From adb88d20dc5f725a79ea0bd71970282c8a91c5d9 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 13:35:33 +0200 Subject: [PATCH 8/9] Using a numeric version number --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e28fc5bc..b00f093c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: needs: build env: description: "A media browser" - version: beta #${{ github.ref }} + version: v0.0.1 #${{ github.ref }} steps: - uses: actions/checkout@v1 - uses: actions/download-artifact@v2 From 1044d853b1d88cc9595f7e1bb2c418859eb87d5c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 2 Apr 2021 13:51:13 +0200 Subject: [PATCH 9/9] Oups --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b00f093c..10f5bcb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: - uses: jiro4989/build-rpm-action@v2 with: package: kyoo - package_root: .pkg + package_root: pkg maintainer: Zoe Roux version: ${{env.version}} arch: x86_64