Merge pull request #42 from CptOfEvilMinions/initial-cicd

Update build pipeline - 11
jmpsec · Dec 28, 2021 · 3bcd656 · 3bcd656
2 parents c40ec1c + d1076b2
commit 3bcd656
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -48,8 +48,7 @@ jobs:
       - name: Upload osctrl bianries
         uses: actions/upload-artifact@v2
         with:
-          #name: osctrl-${{ matrix.components }}-${{ steps.vars.outputs.branch }}-${{ steps.vars.outputs.sha_short }}-${{ matrix.goos }}-${{ matrix.goarch }}
-          name: osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}
+          name: osctrl-${{ matrix.components }}-${{ steps.vars.outputs.branch }}-${{ steps.vars.outputs.sha_short }}-${{ matrix.goos }}-${{ matrix.goarch }}
           path: ./bin/osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin
 
       - name: Create ZIP of build artifacts

diff --git a/.github/workflows/tagged-releases.yml b/.github/workflows/tagged-releases.yml
@@ -6,35 +6,36 @@ on:
       - 'v*'
 
 jobs:
-  # build_and_test:
-  #   runs-on: ubuntu-20.04
-  #   strategy:
-  #     matrix:
-  #       components: ['tls', 'admin', 'api', 'cli']
-  #       goos: ['linux']
-  #       goarch: ['amd64']
-  #   steps:
-  #     ######################################## Checkout code ########################################
-  #     - name: Checkout code
-  #       uses: actions/checkout@v2
-  #     ######################################## Install go ########################################
-  #     - name: Set up Go
-  #       uses: actions/setup-go@v2
-  #       with:
-  #         go-version: 1.17
-  #     - run: go version
-  #     ######################################## Get GO deps ########################################
-  #     - name: Get GO deps
-  #       run: go mod download
-  #     ######################################## Build osctrl binaries ########################################
-  #     - name: Build osctrl-tls
-  #       run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o ./bin/osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin ./${{ matrix.components }}
-  #     ######################################## Upload artifacts ########################################
-  #     - name: Upload osctrl bianries
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin
-  #         path: ./bin/osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin
+  build_and_test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        components: ['tls', 'admin', 'api', 'cli']
+        goos: ['linux']
+        goarch: ['amd64']
+    steps:
+      ######################################## Checkout code ########################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ######################################## Install go ########################################
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
+      - run: go version
+      ######################################## Get GO deps ########################################
+      - name: Get GO deps
+        run: go mod download
+      ######################################## Build osctrl binaries ########################################
+      - name: Build osctrl-tls
+        run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o ./bin/osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin ./${{ matrix.components }}
+      ######################################## Upload artifacts ########################################
+      - name: Upload osctrl bianries
+        uses: actions/upload-artifact@v2
+        with:
+          name: osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin
+          path: ./bin/osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}.bin
+
   release:
     runs-on: ubuntu-20.04
     strategy:
@@ -64,8 +65,7 @@ jobs:
       - name: Download osctrl binaries
         uses: actions/download-artifact@v2
         with:
-          #name: osctrl-${{ matrix.components }}-master-${{ steps.vars.outputs.pr_commit }}-${{ matrix.goos }}-${{ matrix.goarch }}
-          name: osctrl-${{ matrix.components }}-${{ matrix.goos }}-${{ matrix.goarch }}
+          name: osctrl-${{ matrix.components }}-master-${{ steps.vars.outputs.pr_commit }}-${{ matrix.goos }}-${{ matrix.goarch }}
 
       - name: Rename binaries
         run: |