Fix GitHub Actions

songquanpeng · Dec 10, 2022 · 75ef484 · 75ef484
1 parent 5b5fdb2
commit 75ef484
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -20,6 +20,10 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
+      - name: Save version info
+        run: |
+          git describe --tags > VERSION 
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:

diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Build Backend
         run: |
           go mod download
-          go build -ldflags "-s -w -X 'wechat-server/common.Version=$(git describe --tags)'" -o wechat-server
+          go build -ldflags "-s -w -X 'wechat-server/common.Version=$(git describe --tags)' -extldflags '-static'" -o wechat-server
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,9 @@ FROM node:16 as builder
 
 WORKDIR /build
 COPY ./web .
+COPY ./VERSION .
 RUN npm install
-RUN npm run build
+RUN REACT_APP_VERSION=$(cat VERSION) npm run build
 
 FROM golang AS builder2
 
@@ -15,7 +16,7 @@ WORKDIR /build
 COPY . .
 COPY --from=builder /build/build ./web/build
 RUN go mod download
-RUN go build -ldflags "-s -w -extldflags '-static'" -o wechat-server
+RUN go build -ldflags "-s -w -X 'wechat-server/common.Version=$(cat VERSION)' -extldflags '-static'" -o wechat-server
 
 FROM alpine