From 4fcf18857e196f1b2790854578b7b6e6a98113b8 Mon Sep 17 00:00:00 2001 From: jinnrry Date: Fri, 1 Mar 2024 20:37:17 +0800 Subject: [PATCH] fix --- .github/workflows/release.yml | 1 + Dockerfile | 8 ++++---- DockerfileGithubAction | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d01f4f..9e9ccd5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,6 +57,7 @@ jobs: go build -ldflags "-s -w" -o ${{ env.TGFILENAME }} hooks/telegram_push/telegram_push.go go build -ldflags "-s -w" -o ${{ env.WEBFILENAME }} hooks/web_push/web_push.go go build -ldflags "-s -w" -o ${{ env.WCFILENAME }} hooks/wechat_push/wechat_push.go + ls -alh - name: Upload files to Artifacts uses: actions/upload-artifact@v3 with: diff --git a/Dockerfile b/Dockerfile index 508ec75..57259fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,10 @@ COPY server . COPY --from=febuild /work/dist /work/http_server/dist RUN apk update && apk add git -RUN go build -ldflags "-X 'main.goVersion=$(go version)' -X 'main.gitHash=$(git show -s --format=%H)' -X 'main.buildTime=$(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)'" -o pmail main.go -RUN cd /work/hooks/telegram_push && go build -ldflags "-s -W" -o output/telegram_push main.go -RUN cd /work/hooks/web_push && go build -ldflags "-s -W" -o output/web_push main.go -RUN cd /work/hooks/wechat_push && go build -ldflags "-s -W" -o output/wechat_push main.go +RUN go build -ldflags "-s -w -X 'main.goVersion=$(go version)' -X 'main.gitHash=$(git show -s --format=%H)' -X 'main.buildTime=$(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)'" -o pmail main.go +RUN cd /work/hooks/telegram_push && go build -ldflags "-s -w" -o output/telegram_push main.go +RUN cd /work/hooks/web_push && go build -ldflags "-s -w" -o output/web_push main.go +RUN cd /work/hooks/wechat_push && go build -ldflags "-s -w" -o output/wechat_push main.go FROM alpine diff --git a/DockerfileGithubAction b/DockerfileGithubAction index 3562eec..6a3b5f9 100644 --- a/DockerfileGithubAction +++ b/DockerfileGithubAction @@ -6,9 +6,9 @@ COPY server . RUN apk update && apk add git RUN go build -ldflags "-s -w -X 'main.goVersion=$(go version)' -X 'main.gitHash=$(git show -s --format=%H)' -X 'main.buildTime=$(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)'" -o pmail main.go -RUN cd /work/hooks/telegram_push && go build -ldflags "-s -W" -o output/telegram_push telegram_push.go -RUN cd /work/hooks/web_push && go build -ldflags "-s -W" -o output/web_push web_push.go -RUN cd /work/hooks/wechat_push && go build -ldflags "-s -W" -o output/wechat_push wechat_push.go +RUN cd /work/hooks/telegram_push && go build -ldflags "-s -w" -o output/telegram_push telegram_push.go +RUN cd /work/hooks/web_push && go build -ldflags "-s -w" -o output/web_push web_push.go +RUN cd /work/hooks/wechat_push && go build -ldflags "-s -w" -o output/wechat_push wechat_push.go FROM alpine