Merge branch 'release/v1.3.5'

bonaysoft · Jun 8, 2020 · 70856af · 70856af
2 parents 6caeeff + 3a072ce
commit 70856af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,6 +2,7 @@ name: build
 on:
   push:
     branches:
+      - develop
       - master
   pull_request:
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,12 +3,11 @@ FROM golang:1.13
 ENV APP_HOME /srv
 WORKDIR $APP_HOME
 
-ENV GOPROXY=https://goproxy.cn,direct
 COPY go.* $APP_HOME/
 RUN go mod download
 
 COPY . .
-RUN make build
+RUN make build && cp build/bin/uptoc /usr/local/bin
 
 COPY scripts/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
@@ -7,4 +7,4 @@ fi
 echo "${ARGS} ${INPUT_DIST}"
 
 # shellcheck disable=SC2086
-/srv/build/bin/uptoc ${ARGS} ${INPUT_DIST}
+uptoc ${ARGS} ${INPUT_DIST}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ name: build @@
     on:
       push:
         branches:
+          - develop
           - master
       pull_request:
@@ Expand Down @@