[RSDK-7007] Add prerelease and other build automation

.github/workflows/test.yaml

@@ -2,10 +2,15 @@ on:
   pull_request:
   workflow_dispatch:
   workflow_call:
+  push:
+    branches:
+      - main
+  release:
+    types: [created]
 
 jobs:
   test:
-    name: Test lint and build
+    name: Lint, Test, Build
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -23,5 +28,31 @@ jobs:
             git status
             exit 1
         fi
+    - name: Test
+      run: make test
     - name: Build
       run: make all
+
+  build:
+    name: Build and Upload
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' || github.event_name == 'release'
+    needs: test
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0 #required to be able to generate prerelease tags
+    - uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+    - uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.GCP_CREDENTIALS }}
+    - uses: google-github-actions/setup-gcloud@v2
+    - name: Build
+      run: make all
+    - name: Upload binaries to GCS
+      run: gsutil -h "Cache-Control:no-cache" cp bin/viam-agent-* gs://packages.viam.com/temp/prerelease/ #TODO use real target after live testing
+    - name: "Upload install scripts to GCS"
+      if: github.event_name == 'release'
+      run: gsutil -h "Cache-Control:no-cache" cp preinstall.sh install.sh uninstall.sh gs://packages.viam.com/temp/prerelease/ #TODO use real target after live testing

Makefile

@@ -7,7 +7,17 @@ LINUX_ARCH = aarch64
 endif
 
 ifeq ($(shell git status -s),)
-	TAG_VERSION ?= $(shell git tag --points-at | sort -Vr | head -n1 | cut -c2-)
+	ifeq ($(shell git branch --show-current),main)
+		LAST_TAG := $(shell git describe --tags --abbrev=0 2>/dev/null)
+		COMMITS_SINCE_TAG := $(shell git rev-list $(LAST_TAG)..HEAD --count 2>/dev/null)
+		BASE_VERSION := $(shell echo $(LAST_TAG) | cut -c2-)
+		NEXT_VERSION := $(shell echo $(BASE_VERSION) | awk -F. '{$$3+=1}1' OFS=.)
+		ifeq ($(COMMITS_SINCE_TAG),0)
+			TAG_VERSION ?= $(BASE_VERSION)
+		else
+			TAG_VERSION ?= $(NEXT_VERSION)-dev.$(COMMITS_SINCE_TAG)
+		endif
+	endif
 	GIT_REVISION = $(shell git rev-parse HEAD | tr -d '\n')
 endif
 ifeq ($(TAG_VERSION),)
@@ -35,7 +45,7 @@ amd64:
 
 bin/viam-agent-$(PATH_VERSION)-$(LINUX_ARCH): go.* *.go */*.go */*/*.go *.service Makefile
 	go build -o $@ -trimpath -tags $(TAGS) -ldflags $(LDFLAGS) ./cmd/viam-agent/main.go
-	test "$(PATH_VERSION)" != "custom" && cp $@ bin/viam-agent-stable-$(LINUX_ARCH) || true
+	echo $(PATH_VERSION) | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$$' && cp $@ bin/viam-agent-stable-$(LINUX_ARCH) || true
 
 .PHONY: clean
 clean:
@@ -49,11 +59,16 @@ lint: bin/golangci-lint
 	go mod tidy
 	bin/golangci-lint run -v --fix
 
+.PHONY: test
+test:
+	go test -race ./...
+
 .PHONY: upload-stable
 upload-stable: bin/viam-agent-$(PATH_VERSION)-x86_64 bin/viam-agent-$(PATH_VERSION)-aarch64 bin/viam-agent-stable-x86_64 bin/viam-agent-stable-aarch64
-	test "$(PATH_VERSION)" != "custom"
+	echo $(PATH_VERSION) | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$$' || exit 1
 	gsutil -h "Cache-Control:no-cache" cp bin/viam-agent-$(PATH_VERSION)-x86_64 bin/viam-agent-$(PATH_VERSION)-aarch64 bin/viam-agent-stable-x86_64 bin/viam-agent-stable-aarch64 gs://packages.viam.com/apps/viam-agent/
 
 .PHONY: upload-installer
 upload-installer:
+	echo $(PATH_VERSION) | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$$' || exit 1
 	gsutil -h "Cache-Control:no-cache" cp preinstall.sh install.sh uninstall.sh gs://packages.viam.com/apps/viam-agent/

utils/config_test.go

@@ -65,16 +65,21 @@ func TestConvertJson(t *testing.T) {
 	err := json.Unmarshal([]byte(jsonBytes), newConfig)
 
 	testConfig := DefaultConfig()
-	testConfig.AdditionalNetworks["network1"] = NetworkDefinition{
-		Type:        "wifi",
-		Interface:   "wlan0",
-		SSID:        "foo",
-		PSK:         "bar",
-		IPv4Address: "192.168.0.1/24",
-		IPv4Gateway: "192.168.0.255",
-		IPv4DNS:     []string{"192.168.0.255"},
+	testConfig.AdditionalNetworks = map[string]NetworkDefinition{
+		"network1": {
+			Type:        "wifi",
+			Interface:   "wlan0",
+			SSID:        "foo",
+			PSK:         "bar",
+			IPv4Address: "192.168.0.1/24",
+			IPv4Gateway: "192.168.0.255",
+			IPv4DNS:     []string{"192.168.0.255"},
+		},
+		"network2": {
+			SSID: "moo",
+			PSK:  "cow",
+		},
 	}
-	testConfig.AdditionalNetworks["network2"] = NetworkDefinition{SSID: "moo", PSK: "cow"}
 
 	test.That(t, err, test.ShouldBeNil)
 	test.That(t, *newConfig, test.ShouldResemble, testConfig)