From 034dc1f5b30a523357c308e0434d9a8725ffbaad Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 13 Mar 2024 11:16:58 +0900
Subject: [PATCH 1/3] =?UTF-8?q?watchdog-go:=20ci=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=81=AE=E6=9D=A1=E4=BB=B6=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/watchdog-build.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/watchdog-build.yaml b/.gitea/workflows/watchdog-build.yaml
index 8afeb9b..4e0ceee 100644
--- a/.gitea/workflows/watchdog-build.yaml
+++ b/.gitea/workflows/watchdog-build.yaml
@@ -1,6 +1,9 @@
 on:
   pull_request:
     types:
+      - labeled
+      - opened
+      - synchronize
       - closed
   workflow_dispatch:
 
@@ -15,7 +18,7 @@ jobs:
     defaults:
       run:
         working-directory: ./watchdog-go
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name,'watchdog-go')
+    if: contains(github.event.pull_request.labels.*.name,'watchdog-go')
 
 
     steps:
@@ -31,4 +34,4 @@ jobs:
           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
+          push: $${{ github.event.pull_request.merged == true }}
\ No newline at end of file
-- 
2.43.0


From ded519314ea301f5be6bca3398a160c636ddd36f Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 13 Mar 2024 11:19:34 +0900
Subject: [PATCH 2/3] =?UTF-8?q?watchdog-go:=20ci=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=81=AE=E6=9D=A1=E4=BB=B6=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .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 4e0ceee..9fdfc9e 100644
--- a/.gitea/workflows/watchdog-build.yaml
+++ b/.gitea/workflows/watchdog-build.yaml
@@ -34,4 +34,4 @@ jobs:
           context: ./watchdog-go
 
           tags: git.usbharu.dev/usbharu/watchdog-go:latest,git.usbharu.dev/usbharu/watchdog-go:${{ github.sha }}
-          push: $${{ github.event.pull_request.merged == true }}
\ No newline at end of file
+          push: ${{ github.event.pull_request.merged == true }}
\ No newline at end of file
-- 
2.43.0


From 757c7214757393dac21b830d2f0f0902ca4352ef Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 13 Mar 2024 11:22:47 +0900
Subject: [PATCH 3/3] =?UTF-8?q?watchdog-go:=20Dockerfile=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 watchdog-go/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/watchdog-go/Dockerfile b/watchdog-go/Dockerfile
index ebfff5e..9959ba4 100644
--- a/watchdog-go/Dockerfile
+++ b/watchdog-go/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.22.1-alpine3.19 as build
 WORKDIR /app
 COPY go.mod go.sum main.go ./
-COPY git.usbharu.dev/ ./git.usbharu.dev
+COPY watchdog/ ./watchdog
 RUN go mod download &&  go build -o watchdog-go -ldflags="-s -w" -trimpath
 
 FROM alpine:3.19
-- 
2.43.0