Release 1.31.0

.github/workflows/artifacts-cd.yml

@@ -29,13 +29,14 @@ jobs:
       - name: Upload Artifcats
         uses: actions/upload-artifact@v2
         with:
-          name: webpackage
-          path: bin/
-
+          name: frontend
+          path: bin/web/dist/web
 
   backend:
     name: Build Backend Artifacts
     runs-on: ubuntu-latest
+    needs:
+      - frontend
     strategy:
       matrix:
         goos:
@@ -49,9 +50,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: "1.18beta2"
+          go-version: '1.18rc1'
       - name: Check out code
         uses: actions/checkout@v2
+      - name: Retrieve frontend files
+        uses: actions/download-artifact@v2
+        with:
+          name: frontend
+          path: internal/util/embedded/webdist
       - name: Get dependencies
         run: go get -v ./...
       - name: Populate info embeds

.github/workflows/releases-cd.yml

@@ -7,7 +7,6 @@ on:
       - '*'
 
 jobs:
-
   frontend:
     name: Build Frontend Artifacts
     runs-on: ubuntu-latest
@@ -28,12 +27,14 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: frontend
-          path: bin/
+          path: bin/web/dist/web
           retention-days: 1
 
   backend:
     name: Build Backend Artifacts
     runs-on: ubuntu-latest
+    needs:
+      - frontend
     strategy:
       matrix:
         goos:
@@ -47,9 +48,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: "1.18beta2"
+          go-version: '1.18rc1'
       - name: Check out code
         uses: actions/checkout@v2
+      - name: Retrieve frontend files
+        uses: actions/download-artifact@v2
+        with:
+          name: frontend
+          path: internal/util/embedded/webdist
       - name: Get dependencies
         run: go get -v ./...
       - name: Populate info embeds
@@ -75,45 +81,25 @@ jobs:
     name: Deploy to Releases
     runs-on: ubuntu-latest
     needs:
-      - "frontend"
-      - "backend"
+      - 'backend'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Retrieve backend binaries
         uses: actions/download-artifact@v2
         with:
           name: backend
-          path: bin/source/
-      - name: Retrieve frontend binaries
-        uses: actions/download-artifact@v2
-        with:
-          name: frontend
-          path: bin/source/
+          path: bin/
       - name: Inject Version into Changelog
         run: |-
-           sed -i "s/\[VERSION\]/$(git describe --tags --abbrev=0)/g" CHANGELOG.md
-      - name: Bundle Artifacts
-        working-directory: bin/source/
-        run: |-
-          mkdir ../final
-          tar -czvf ../final/build_assets.tar.gz *
-      - name: Generate Checksums
-        working-directory: bin/final/
-        run: |-
-          md5sum * | tee ../md5sum.txt
-          sha256sum * | tee ../sha256sum.txt
-          mv ../md5sum.txt ./
-          mv ../sha256sum.txt ./
+          sed -i "s/\[VERSION\]/$(git describe --tags --abbrev=0)/g" CHANGELOG.md
       - name: Set up Hub
         run: |-
           sudo snap install hub --classic
       - name: Deploy to Releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: 'hub release create
-            -a ./bin/final/build_assets.tar.gz
-            -a ./bin/final/md5sum.txt
-            -a ./bin/final/sha256sum.txt
-            -F ./CHANGELOG.md
-            $(git describe --tags --abbrev=0)'
+        run: "hub release create
+          $(ls ./bin -1 | xargs -I % printf '-a ./bin/% ')
+          -F ./CHANGELOG.md
+          $(git describe --tags --abbrev=0)"

.github/workflows/tests-ci.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: "1.18beta2"
+          go-version: '1.18rc1'
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

.github/workflows/wiki-ci.yml

@@ -9,16 +9,14 @@ on:
       - '**.md'
 
 jobs:
-
   wiki-generate:
-
     name: Wiki Generation
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.17
         uses: actions/setup-go@v1
         with:
-          go-version: "1.18beta2"
+          go-version: '1.18rc1'
         id: go
 
       - name: Check out code into the Go module directory

.gitignore

@@ -13,3 +13,5 @@ deploy/
 cmd/test/*
 .DS_Store
 web/.angular/
+internal/util/embedded/webdist/*
+!internal/util/embedded/webdist/keep

Dockerfile

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------
 # --- STAGE 1: Build Backend and Go Tools
-FROM golang:1.18beta2-alpine AS build-be
+FROM golang:1.18rc1-alpine AS build-be
 WORKDIR /build
 
 # Copy source files

Makefile

@@ -54,7 +54,7 @@ endif
 
 
 PHONY = _make
-_make: deps build fe copyfe cleanup
+_make: deps fe copyfe build cleanup
 
 PHONY += build
 build: $(BIN)
@@ -103,8 +103,7 @@ fe:
 
 PHONY += copyfe
 copyfe:
-	mkdir -p bin/web/dist
-	cp -R web/dist/web bin/web/dist
+	cp -R web/dist/web/* internal/util/embedded/webdist
 
 PHONY += runfe
 runfe: