From de091fa53b9338526e133b806b432db8cfadf4b4 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 11:35:50 +0800 Subject: [PATCH 01/18] fix: pr ci. --- .github/workflows/build.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28f02017..eac7c746 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,10 @@ name: Build Docker on: pull_request: + types: + - closed + branches: + - main push: jobs: @@ -64,17 +68,17 @@ jobs: echo "dev: ${{ steps.dev.outputs.dev }}" echo "version: ${{ steps.version.outputs.version }}" outputs: - release: ${{ steps.release.outputs.release }} - dev: ${{ steps.dev.outputs.dev }} - version: ${{ steps.version.outputs.version }} + release: ${{ steps.release.outputs.release }} + dev: ${{ steps.dev.outputs.dev }} + version: ${{ steps.version.outputs.version }} build-webui: runs-on: ubuntu-latest - needs: [test, version-info] + needs: [ test, version-info ] if: ${{ needs.version-info.outputs.release == 1 || needs.version-info.outputs.dev == 1 }} strategy: matrix: - node-version: [18] + node-version: [ 18 ] steps: - name: Checkout uses: actions/checkout@v3 @@ -105,7 +109,7 @@ jobs: build-docker: runs-on: ubuntu-latest - needs: [build-webui, version-info] + needs: [ build-webui, version-info ] steps: - name: Checkout uses: actions/checkout@v3 @@ -208,7 +212,7 @@ jobs: release: runs-on: ubuntu-latest - needs: [build-docker, version-info] + needs: [ build-docker, version-info ] if: ${{ needs.version-info.outputs.release == 1 }} outputs: url: ${{ steps.release.outputs.url }} @@ -254,7 +258,7 @@ jobs: telegram: runs-on: ubuntu-latest - needs: [release] + needs: [ release ] steps: - name: send telegram message on push uses: appleboy/telegram-action@master From 63ab5a941e6922a85e6e8f375b55d6c6ca5d5f63 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 11:37:22 +0800 Subject: [PATCH 02/18] fix: tag message. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eac7c746..4f79c0a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT git config --local user.email git config --local user.name "github-actions" - git tag -a ${{ github.event.pull_request.title }} -m ${{ github.event.pull_request.body }} + git tag ${{ github.event.pull_request.title }} git push origin ${{ github.event.pull_request.title }} elif [[ ${{ github.event_name }} == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT From 4b6ac3140943290a0825820b963c5af7e4e15461 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 11:44:13 +0800 Subject: [PATCH 03/18] fix: string problem. --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f79c0a2..356eeda0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,8 @@ jobs: - name: If release id: release run: | - if [[${{ github.event_name }}== 'pull_request'] && [${{ github.event.pull_request.merged }} == true]] || \ - [[ ${{ github.event_name }} == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then + if [['${{ github.event_name }}' == 'pull_request'] && [${{ github.event.pull_request.merged }} == true]] || \ + [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "release=1" >> $GITHUB_OUTPUT else echo "release=0" >> $GITHUB_OUTPUT @@ -43,7 +43,7 @@ jobs: - name: If dev id: dev run: | - if [[ ${{ github.event_name }} == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then + if [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "dev=1" >> $GITHUB_OUTPUT else echo "dev=0" >> $GITHUB_OUTPUT @@ -51,7 +51,7 @@ jobs: - name: Check version id: version run: | - if [${{ github.event_name }} == 'pull_request' && ${{ github.event.pull_request.merged }} == true]; then + if [ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT git config --local user.email git config --local user.name "github-actions" From 0714390259d00ee012b8860544262c9553361d9c Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 11:46:59 +0800 Subject: [PATCH 04/18] fix: string problem. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 356eeda0..bae4f028 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - name: If release id: release run: | - if [['${{ github.event_name }}' == 'pull_request'] && [${{ github.event.pull_request.merged }} == true]] || \ + if [[ '${{ github.event_name }}' == 'pull_request' ] && [ ${{ github.event.pull_request.merged }} == true ]] || \ [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "release=1" >> $GITHUB_OUTPUT else @@ -51,7 +51,7 @@ jobs: - name: Check version id: version run: | - if [ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true]; then + if [ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT git config --local user.email git config --local user.name "github-actions" From d996ddf85af621d9b01f0be13d675a28e4259024 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:09:09 +0800 Subject: [PATCH 05/18] fix: ci problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bae4f028..86a2279f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - name: If release id: release run: | - if [[ '${{ github.event_name }}' == 'pull_request' ] && [ ${{ github.event.pull_request.merged }} == true ]] || \ + if [[ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]] || \ [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "release=1" >> $GITHUB_OUTPUT else From 42e49534f914c96e85fef0ef006575d760d3f357 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:47:42 +0800 Subject: [PATCH 06/18] fix: ci problem. --- .github/workflows/build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86a2279f..3ec932d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,13 @@ jobs: - name: If release id: release run: | - if [[ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]] || \ - [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then + if [ '${{ github.event_name }}' == 'pull_request' ]; then + if [ ${{ github.event.pull_request.merged }} == true ]; then + echo "release=1" >> $GITHUB_OUTPUT + else + echo "release=0" >> $GITHUB_OUTPUT + fi + elif [[ '${{ github.event_name }}' == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "release=1" >> $GITHUB_OUTPUT else echo "release=0" >> $GITHUB_OUTPUT From 6e6a316193f49c6b886bf3a36567a3ae9a0b8a21 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:50:29 +0800 Subject: [PATCH 07/18] fix: ci problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ec932d6..6ef67c6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Check version id: version run: | - if [ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]; then + if [[ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT git config --local user.email git config --local user.name "github-actions" From 03e23943bf4ad499ef8d060465bfa72b059cfc29 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:53:11 +0800 Subject: [PATCH 08/18] fix: ci problem. --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ef67c6a..0abede97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,8 @@ jobs: version-info: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 - name: If release id: release run: | @@ -58,7 +60,7 @@ jobs: run: | if [[ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT - git config --local user.email + git config --local user.email "action@github.com" git config --local user.name "github-actions" git tag ${{ github.event.pull_request.title }} git push origin ${{ github.event.pull_request.title }} From bc4ad22dadc48c836d04a738f228436651ca8ad6 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:55:13 +0800 Subject: [PATCH 09/18] fix: ci problem. --- .github/workflows/build.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0abede97..442e4e28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,12 +58,14 @@ jobs: - name: Check version id: version run: | - if [[ '${{ github.event_name }}' == 'pull_request' && ${{ github.event.pull_request.merged }} == true ]]; then - echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT - git config --local user.email "action@github.com" - git config --local user.name "github-actions" - git tag ${{ github.event.pull_request.title }} - git push origin ${{ github.event.pull_request.title }} + if [ '${{ github.event_name }}' == 'pull_request']; then + if [ ${{ github.event.pull_request.merged }} == true ]; then + echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT + git config --local user.email "action@github.com" + git config --local user.name "github-actions" + git tag ${{ github.event.pull_request.title }} + git push origin ${{ github.event.pull_request.title }} + fi elif [[ ${{ github.event_name }} == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT else From d0605fef49a890a4a2b4b026fe0143b250d9050f Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 13:58:45 +0800 Subject: [PATCH 10/18] fix: ci problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 442e4e28..382515a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: - name: Check version id: version run: | - if [ '${{ github.event_name }}' == 'pull_request']; then + if [ '${{ github.event_name }}' == 'pull_request' ]; then if [ ${{ github.event.pull_request.merged }} == true ]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT git config --local user.email "action@github.com" From 695a131e5e4cd045b38c986ad20fab2750994942 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:07:45 +0800 Subject: [PATCH 11/18] fix: ci problem. --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 382515a5..224cf02b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,16 +61,19 @@ jobs: if [ '${{ github.event_name }}' == 'pull_request' ]; then if [ ${{ github.event.pull_request.merged }} == true ]; then echo "version=${{ github.event.pull_request.title }}" >> $GITHUB_OUTPUT - git config --local user.email "action@github.com" - git config --local user.name "github-actions" - git tag ${{ github.event.pull_request.title }} - git push origin ${{ github.event.pull_request.title }} fi elif [[ ${{ github.event_name }} == 'push' && (${{ github.ref }} == *'alpha'* || ${{ github.ref }} == *'beta'*) ]]; then echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT else echo "version=Test" >> $GITHUB_OUTPUT fi + - name: Create Tag + uses: rickstaa/action-create-tag@v1 + if: ${{ step.version-info.outputs.release == 1 }} && ${{ step.version-info.outputs.dev != 1 }} + with: + tag: ${{ step.version-info.outputs.version }} + message: ${{ step.version-info.outputs.version }} + github_token: ${{ secrets.ACCESS_TOKEN }} - name: Check result run: | echo "release: ${{ steps.release.outputs.release }}" From 50031d41c062b16156b86447e4c9d27c9ff9f97b Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:09:47 +0800 Subject: [PATCH 12/18] fix: ci problem. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 224cf02b..965e432b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,10 +69,10 @@ jobs: fi - name: Create Tag uses: rickstaa/action-create-tag@v1 - if: ${{ step.version-info.outputs.release == 1 }} && ${{ step.version-info.outputs.dev != 1 }} + if: ${{ step.release.outputs.release == 1 }} && ${{ step.dev.outputs.dev != 1 }} with: - tag: ${{ step.version-info.outputs.version }} - message: ${{ step.version-info.outputs.version }} + tag: ${{ step.version.outputs.version }} + message: ${{ step.version.outputs.version }} github_token: ${{ secrets.ACCESS_TOKEN }} - name: Check result run: | From 0a6538a5411586a7142a1d516508405226cb1009 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:10:38 +0800 Subject: [PATCH 13/18] fix: ci problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 965e432b..7acf9cbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: fi - name: Create Tag uses: rickstaa/action-create-tag@v1 - if: ${{ step.release.outputs.release == 1 }} && ${{ step.dev.outputs.dev != 1 }} + if: ${{ step.release.outputs.release == 1 && step.dev.outputs.dev != 1 }} with: tag: ${{ step.version.outputs.version }} message: ${{ step.version.outputs.version }} From b7c2eb84359055b2e21aacf0d3edbec84128a2cc Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:11:13 +0800 Subject: [PATCH 14/18] fix: ci problem. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7acf9cbd..791592bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,10 +69,10 @@ jobs: fi - name: Create Tag uses: rickstaa/action-create-tag@v1 - if: ${{ step.release.outputs.release == 1 && step.dev.outputs.dev != 1 }} + if: ${{ steps.release.outputs.release == 1 && steps.dev.outputs.dev != 1 }} with: - tag: ${{ step.version.outputs.version }} - message: ${{ step.version.outputs.version }} + tag: ${{ steps.version.outputs.version }} + message: ${{ steps.version.outputs.version }} github_token: ${{ secrets.ACCESS_TOKEN }} - name: Check result run: | From f936bd8a2eb9413f864e38333365d5c23ecc7470 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:24:35 +0800 Subject: [PATCH 15/18] fix: remove create tag action --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 791592bd..dabd5d07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,13 +67,6 @@ jobs: else echo "version=Test" >> $GITHUB_OUTPUT fi - - name: Create Tag - uses: rickstaa/action-create-tag@v1 - if: ${{ steps.release.outputs.release == 1 && steps.dev.outputs.dev != 1 }} - with: - tag: ${{ steps.version.outputs.version }} - message: ${{ steps.version.outputs.version }} - github_token: ${{ secrets.ACCESS_TOKEN }} - name: Check result run: | echo "release: ${{ steps.release.outputs.release }}" From a07557f56470386a6269764842ea4e2b67699a9a Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:39:17 +0800 Subject: [PATCH 16/18] fix: version tag problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dabd5d07..4789d49b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: estrellaxd/auto_bangumi ghcr.io/${{ github.repository }} tags: | - type=semver,pattern=${{ needs.version-info.outputs.version }} + type=raw,pattern=${{ needs.version-info.outputs.version }} type=raw,value=latest - name: Docker metadata dev From 8d48d682be5ab1b9f402f3c645d97888d038c75c Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:43:36 +0800 Subject: [PATCH 17/18] fix: version tag problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4789d49b..94cb617b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: estrellaxd/auto_bangumi ghcr.io/${{ github.repository }} tags: | - type=raw,pattern=${{ needs.version-info.outputs.version }} + type=raw,value=${{ needs.version-info.outputs.version }} type=raw,value=latest - name: Docker metadata dev From 4cb2f685f63aafc07eaa96b5f4a81bfc2406a60a Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 24 Sep 2023 14:50:58 +0800 Subject: [PATCH 18/18] fix: version tag problem. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94cb617b..1ce4f933 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,7 +184,7 @@ jobs: context: . builder: ${{ steps.buildx.output.name }} platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: ${{ github.event_name == 'push' }} + push: True tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha, scope=${{ github.workflow }}