fixes for build scripts

2 years ago · d3b5a77efb
parent af65b36d2b
commit d3b5a77efb
3 changed files with 5 additions and 5 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -23,7 +23,7 @@ jobs:
          goversion: 1.17
          goos: ${{ matrix.goos }}
          goarch: ${{ matrix.goarch }}
-          build_command: bash ./build.sh
-          pre_command: bash ./install-deps.sh
+          build_command: bash -ex ./build.sh
+          pre_command: bash -ex ./install-deps.sh
          binary_name: "ovpn-admin"
          asset_name: ovpn-admin-${{ matrix.goos }}-${{ matrix.goarch }}
--- a/.github/workflows/release_arm.yaml
+++ b/.github/workflows/release_arm.yaml
@ -23,7 +23,7 @@ jobs:
          goversion: 1.17
          goos: ${{ matrix.goos }}
          goarch: ${{ matrix.goarch }}
-          build_command: bash ./build_arm.sh
-          pre_command: bash ./install-deps-arm.sh
+          build_command: bash -ex ./build_arm.sh
+          pre_command: bash -ex ./install-deps-arm.sh
          binary_name: "ovpn-admin"
          asset_name: ovpn-admin-${{ matrix.goos }}-${{ matrix.goarch }}
--- a/build.sh
+++ b/build.sh
@ -6,6 +6,6 @@ cd frontend && npm install && npm run build && cd ..

 packr2

-CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags "-linkmode external -extldflags -static -s -w" @
+CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags "-linkmode external -extldflags -static -s -w" $@

 packr2 clean