From d74a6dfbe0e825c55be0b38516f5bc20f7df6281 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:24:14 +0900 Subject: [PATCH 01/19] =?UTF-8?q?watchdog-go:=20ci=20=E6=89=8B=E5=8B=95?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=82=92=E8=A8=B1=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ignore diff --git a/ignore b/ignore new file mode 100644 index 0000000..e69de29 -- 2.43.0 From 83335a4d973ae66fc1ff7543dd027efbb9284d99 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:27:10 +0900 Subject: [PATCH 02/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 446ca08..497b003 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -16,7 +16,7 @@ ((github.event.action == 'labeled') && (github.event.label.name == 'watchdog-go')) || ((github.event.action == 'synchronize') && - contains(github.event.pull_request.labels.*.name, 'watchdog-go') || + contains(github.event.pull_request.labels.*.name, 'watchdog-go')) || (github.event.action == 'workflow_dispatch') steps: -- 2.43.0 From 2ae57c535f5357b76d9b683db9b46f51f916188a Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:30:19 +0900 Subject: [PATCH 03/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 497b003..5edecd0 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -7,6 +7,12 @@ workflow_dispatch: jobs: + test: + runs-on: ubuntu-latest + steps: + - run: echo ${{github.event.action}} + - run: echo ${{github.event.pull_request.labels.*.name}} + build-docker-image: runs-on: ubuntu-latest defaults: -- 2.43.0 From 3d806aab92d315072bd0afa6258c324f5c8e6e0f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:31:24 +0900 Subject: [PATCH 04/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 5edecd0..1107fea 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -11,7 +11,7 @@ runs-on: ubuntu-latest steps: - run: echo ${{github.event.action}} - - run: echo ${{github.event.pull_request.labels.*.name}} + - run: echo ${{github.event.pull_request.labels}} build-docker-image: runs-on: ubuntu-latest -- 2.43.0 From e9ff65261dfb5454f9c7392bd024551e923877dd Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:33:53 +0900 Subject: [PATCH 05/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 61 +++++++++++++++------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 1107fea..c9162ab 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -1,32 +1,35 @@ - on: - pull_request: - types: - - opened - - synchronize - - labeled - workflow_dispatch: +on: + pull_request: + types: + - opened + - synchronize + - labeled + workflow_dispatch: - jobs: - test: - runs-on: ubuntu-latest - steps: - - run: echo ${{github.event.action}} - - run: echo ${{github.event.pull_request.labels}} +permissions: + pull-requests: read - build-docker-image: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ./watchdog-go - if: | - ((github.event.action == 'labeled') && - (github.event.label.name == 'watchdog-go')) || - ((github.event.action == 'synchronize') && - contains(github.event.pull_request.labels.*.name, 'watchdog-go')) || - (github.event.action == 'workflow_dispatch') +jobs: + test: + runs-on: ubuntu-latest + steps: + - run: echo ${{github.event.action}} + - run: echo ${{github.event.pull_request.labels}} - steps: - - uses: actions/checkout@v3 - - run: docker login -u usbharu -p ${{ secrets.DEPLOY_TOKEN }} git.usbharu.dev - - run: docker build ./ watchdog-go -t latest -t ${{ github.sha }} - - run: docker push git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} \ No newline at end of file + build-docker-image: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./watchdog-go + if: | + ((github.event.action == 'labeled') && + (github.event.label.name == 'watchdog-go')) || + ((github.event.action == 'synchronize') && + contains(github.event.pull_request.labels.*.name, 'watchdog-go')) || + (github.event.action == 'workflow_dispatch') + + steps: + - uses: actions/checkout@v3 + - run: docker login -u usbharu -p ${{ secrets.DEPLOY_TOKEN }} git.usbharu.dev + - run: docker build ./ watchdog-go -t latest -t ${{ github.sha }} + - run: docker push git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} \ No newline at end of file -- 2.43.0 From 96a05a1e6ab3e9a22d7d979ffa76e394052d3e1e Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:35:12 +0900 Subject: [PATCH 06/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index c9162ab..0d3e987 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - run: echo ${{github.event.action}} - - run: echo ${{github.event.pull_request.labels}} + - run: echo ${{ fromJSON(github.event.pull_request.labels.*.name) }} }} build-docker-image: runs-on: ubuntu-latest -- 2.43.0 From 9dfdfac7dfb08dc8180d535059a6d1ae30bb671f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:36:13 +0900 Subject: [PATCH 07/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 0d3e987..eae6b7a 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - run: echo ${{github.event.action}} - - run: echo ${{ fromJSON(github.event.pull_request.labels.*.name) }} }} + - run: echo ${{ steps.labels.outputs.json }} }} build-docker-image: runs-on: ubuntu-latest -- 2.43.0 From ddbe502d5625d58f76965dd9266fb2f84b432b59 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:36:32 +0900 Subject: [PATCH 08/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index eae6b7a..5ffde0f 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - run: echo ${{github.event.action}} - - run: echo ${{ steps.labels.outputs.json }} }} + - run: echo ${{ steps.labels.outputs.json }} build-docker-image: runs-on: ubuntu-latest -- 2.43.0 From 44c0bb7ddf66aae51079fc0decae5bc5437e93e9 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:42:11 +0900 Subject: [PATCH 09/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 5ffde0f..36f5192 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - run: echo ${{github.event.action}} - - run: echo ${{ steps.labels.outputs.json }} + - run: echo ${{ contains(github.event.pull_request.labels.*.name, 'watchdog-go') }} build-docker-image: runs-on: ubuntu-latest -- 2.43.0 From 1891b7e9254d562814809378e8d2d19369e98d61 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:44:39 +0900 Subject: [PATCH 10/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 36f5192..5e36f2c 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -24,7 +24,7 @@ jobs: if: | ((github.event.action == 'labeled') && (github.event.label.name == 'watchdog-go')) || - ((github.event.action == 'synchronize') && + ((github.event.action == 'synchronized') && contains(github.event.pull_request.labels.*.name, 'watchdog-go')) || (github.event.action == 'workflow_dispatch') -- 2.43.0 From 995ffccd3e8a7499d44ca41ab4d689dd40808808 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:02:51 +0900 Subject: [PATCH 11/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 5e36f2c..f126744 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -30,6 +30,11 @@ jobs: steps: - uses: actions/checkout@v3 - - run: docker login -u usbharu -p ${{ secrets.DEPLOY_TOKEN }} git.usbharu.dev + - uses: https://github.com/docker/setup-buildx-action@v3 + - uses: docker/login-action@v3 + with: + registry: git.usbharu.dev + username: usbharu + password: ${{ secrets.DEPLOY_TOKEN }} - run: docker build ./ watchdog-go -t latest -t ${{ github.sha }} - run: docker push git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} \ No newline at end of file -- 2.43.0 From 27518e4914c072fa577342a89ce951cb08d4fa48 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:05:24 +0900 Subject: [PATCH 12/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index f126744..ddd6fb1 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: https://github.com/docker/setup-buildx-action@v3 - - uses: docker/login-action@v3 + - uses: https://github.com/docker/login-action@v3 with: registry: git.usbharu.dev username: usbharu -- 2.43.0 From 7bf8e56c28d629c3d383a3e143cc850f6970424b Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:21:10 +0900 Subject: [PATCH 13/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index ddd6fb1..144856a 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -18,6 +18,8 @@ jobs: build-docker-image: runs-on: ubuntu-latest + container: + image: catthehacker/ubuntu:act-latest defaults: run: working-directory: ./watchdog-go -- 2.43.0 From d91c38b537a1bce11bf7ba897ecb575b2bce180e Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:27:40 +0900 Subject: [PATCH 14/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 144856a..5baa689 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -38,5 +38,9 @@ jobs: registry: git.usbharu.dev username: usbharu password: ${{ secrets.DEPLOY_TOKEN }} - - run: docker build ./ watchdog-go -t latest -t ${{ github.sha }} - - run: docker push git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} \ No newline at end of file + - uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile + tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} + push: true \ No newline at end of file -- 2.43.0 From d8745c929055ead2c1e266c3854576928af08713 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:30:17 +0900 Subject: [PATCH 15/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 5baa689..c2fdb62 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -38,7 +38,7 @@ jobs: registry: git.usbharu.dev username: usbharu password: ${{ secrets.DEPLOY_TOKEN }} - - uses: docker/build-push-action@v3 + - uses: https://github.com/docker/build-push-action@v5 with: context: . file: ./Dockerfile -- 2.43.0 From 07df905c79239d3b8422cd326150e902ee1729bf Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:31:40 +0900 Subject: [PATCH 16/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index c2fdb62..c600069 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -41,6 +41,6 @@ jobs: - uses: https://github.com/docker/build-push-action@v5 with: context: . - file: ./Dockerfile +# file: ./Dockerfile tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} push: true \ No newline at end of file -- 2.43.0 From 27b77e420c259d5e7bd7c5ad17e59712dbb36ca4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:32:42 +0900 Subject: [PATCH 17/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index c600069..a7fde61 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -41,6 +41,6 @@ jobs: - uses: https://github.com/docker/build-push-action@v5 with: context: . -# file: ./Dockerfile + file: ./watchdog-go/Dockerfile tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} push: true \ No newline at end of file -- 2.43.0 From abd7ad71fcfd11d03d36214abb9f9c5c13e0eb0d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:35:40 +0900 Subject: [PATCH 18/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index a7fde61..47f0646 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.DEPLOY_TOKEN }} - uses: https://github.com/docker/build-push-action@v5 with: - context: . - file: ./watchdog-go/Dockerfile + context: /watchdog-go + tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} push: true \ No newline at end of file -- 2.43.0 From ea376d0b1f6d951d7b48fd447576365cdb1aab7f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:36:39 +0900 Subject: [PATCH 19/19] watchdog-go: fix --- .gitea/workflows/watchdog-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml index 47f0646..5aad66b 100644 --- a/.gitea/workflows/watchdog-build.yaml +++ b/.gitea/workflows/watchdog-build.yaml @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.DEPLOY_TOKEN }} - uses: https://github.com/docker/build-push-action@v5 with: - context: /watchdog-go + context: ./watchdog-go tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }} push: true \ No newline at end of file -- 2.43.0