Merge pull request #24 from CptOfEvilMinions/build_debs-2

PoC for building DEBs -2
jmpsec · May 4, 2022 · ffc5811 · ffc5811
2 parents a5d9025 + 3461050
commit ffc5811
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build_and_test_main_merge.yml b/.github/workflows/build_and_test_main_merge.yml
@@ -83,7 +83,7 @@ jobs:
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
       ########################### Build DEB packages ###########################
-      - name: Build and deploy osctrl Docker containers
+      - name: Build osctrl DEB packages
         uses: ./.github/actions/build/dpkg
         with:
           go_os: ${{ matrix.goos }}

diff --git a/deploy/cicd/deb/generate-deb-package.sh b/deploy/cicd/deb/generate-deb-package.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 OSCTRL_USER="${VARIABLE:-osctrl}"
 OSCTRL_GROUP="${VARIABLE:-osctrl}"
 WORKING_DIR="${VARIABLE:-/etc/osctrl}"
@@ -37,7 +39,7 @@ cp deploy/config/redis.json "${DEB_DIR}/usr/share/osctrl/redis.json.example" &&
 ###################################### General components content ######################################
 mkdir -p "${DEB_DIR}/etc/osctrl/osctrl-${OSCTRL_COMPONTENT}"  && \
 
-cp osctrl-${OSCTRL_COMPONTENT}-${COMMIT_SHA}-${GOOS}-${GOARCH}.bin "${DEB_DIR}/usr/local/bin/osctrl-${OSCTRL_COMPONTENT}" && \
+cp osctrl-${OSCTRL_COMPONTENT}-${GOOS}-${GOARCH}.bin "${DEB_DIR}/usr/local/bin/osctrl-${OSCTRL_COMPONTENT}" && \
     chmod 755 "${DEB_DIR}/usr/local/bin/osctrl-${OSCTRL_COMPONTENT}"
 
 cp deploy/config/service.json "${DEB_DIR}/etc/osctrl/osctrl-${OSCTRL_COMPONTENT}/service.json" && \