From 7d4d2b222e3d7def03f1c4ac386dafe2ebe797a4 Mon Sep 17 00:00:00 2001 From: bytelang <35958941+bytelang@users.noreply.github.com> Date: Mon, 31 Jan 2022 11:03:24 +0800 Subject: [PATCH 1/2] feat: fix pre_build (#8) (#9) * feat: fix pre_build * fix: fix action tags * fix: add labels * feat: add pre build labels * fear: add release actions Co-authored-by: karaler <97873372+karaler@users.noreply.github.com> --- .github/workflows/build_linux_amd64.yml | 8 ++++---- .github/workflows/build_linux_arm64.yml | 6 +++--- .github/workflows/pr_pre_build.yml | 7 +++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index 862a028..458825d 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -7,10 +7,10 @@ on: jobs: build: name: build - runs-on: | - self-hosted - linux - x64 + runs-on: + - self-hosted + - Linux + - X64 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/build_linux_arm64.yml b/.github/workflows/build_linux_arm64.yml index cd3e34c..4a689c1 100644 --- a/.github/workflows/build_linux_arm64.yml +++ b/.github/workflows/build_linux_arm64.yml @@ -7,10 +7,10 @@ on: jobs: build: name: build - runs-on: | + runs-on: self-hosted - linux - arm64 + Linux + ARM64 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pr_pre_build.yml b/.github/workflows/pr_pre_build.yml index 59ef739..33a162c 100644 --- a/.github/workflows/pr_pre_build.yml +++ b/.github/workflows/pr_pre_build.yml @@ -7,7 +7,10 @@ on: jobs: build: name: build - runs-on: self-hosted + runs-on: + - self-hosted + - Linux + - X64 steps: - name: Checkout uses: actions/checkout@v2 @@ -25,6 +28,6 @@ jobs: -e KPLAYER_AES_IV=${{ secrets.KPLAYER_AES_IV }} \ -e KPLAYER_ROOT_CERT=${{ secrets.KPLAYER_ROOT_CERT }} \ -e KPLAYER_CLIENT_TOKEN=${{ secrets.KPLAYER_CLIENT_TOKEN }} \ - -v $PWD:/kplayer-go internal/kplayer-build:latest bash -ic "source /entrypoint.sh && make build | kpgrep" + -v $PWD:/kplayer-go internal/kplayer-build:amd64 bash -ic "source /entrypoint.sh && make build | kpgrep" cd build ~/.kplayer/optimize From 56df2b2d4f0859f1c9a02dac0579b9f4776fc316 Mon Sep 17 00:00:00 2001 From: karaler Date: Mon, 31 Jan 2022 11:27:59 +0800 Subject: [PATCH 2/2] fix: fix arm64 actions yaml --- .github/workflows/build_linux_amd64.yml | 2 +- .github/workflows/build_linux_arm64.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index 458825d..efd412a 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -1,4 +1,4 @@ -name: build_linux_x86-64 +name: build_linux_amd64 on: push: tags: diff --git a/.github/workflows/build_linux_arm64.yml b/.github/workflows/build_linux_arm64.yml index 4a689c1..5b098c6 100644 --- a/.github/workflows/build_linux_arm64.yml +++ b/.github/workflows/build_linux_arm64.yml @@ -1,4 +1,4 @@ -name: build_linux_x86-64 +name: build_linux_arm64 on: push: tags: @@ -8,9 +8,9 @@ jobs: build: name: build runs-on: - self-hosted - Linux - ARM64 + - self-hosted + - Linux + - ARM64 steps: - name: Checkout uses: actions/checkout@v2