Adhere to semver more closely (#426)

* Update versioning scheme; Use more WF variables

* Add version to archive file names

* Fix quotes

* Change tagging strategy

Author: chadweimer

.github/workflows/ci.yml

@@ -57,21 +57,40 @@ jobs:
           registry: ${{ env.CONTAINER_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - run: make install
-      - run: make build docker BUILD_VERSION="v0.0.0 (master)" CONTAINER_TAG=latest
-        if: startswith(github.ref, 'refs/heads/master')
-      - run: make build docker BUILD_VERSION="v0.0.0 ($(echo $GITHUB_REF | sed -e 's/^refs\/pull\///'))" CONTAINER_TAG=dev
-        if: startswith(github.ref, 'refs/pull/')
-      - run: make build docker BUILD_VERSION="v$(echo $GITHUB_REF | sed -e 's/^refs\/tags\///')" CONTAINER_TAG="$(echo $GITHUB_REF | sed -e 's/^refs\/tags\///')"
-        if: startswith(github.ref, 'refs/tags/')
-      - run: make archive
+
+      - name: Install deps
+        run: make install
+
+      - name: Set env vars (push)
+        run: |
+          echo "BUILD_VERSION=0.0.0-beta+commit.${{ github.sha }}" >> $GITHUB_ENV
+          echo "CONTAINER_TAG=beta" >> $GITHUB_ENV
+        if: github.event_name == 'push'
+      - name: Set env vars (pr)
+        run: |
+          echo "BUILD_VERSION=0.0.0-pr${{ github.event.pull_request.number }}+commit.${{ github.sha }}" >> $GITHUB_ENV
+          echo "CONTAINER_TAG=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
+        if: github.event_name == 'pull_request'
+      - name: Set env vars (release)
+        run: |
+          echo "BUILD_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          echo "CONTAINER_TAG=latest" >> $GITHUB_ENV
+        if: github.event_name == 'release'
+
+      - name: Build
+        run: make build docker archive
+
+      - name: Publish container image (release)
+        run: make docker CONTAINER_TAG=${{ github.event.release.tag_name }}
+        if: github.event_name == 'release'
+
       - uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: |
             build/gomp-*
       - uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
+        if: github.event_name == 'release'
         with:
           files: |
             build/gomp-*

Makefile

@@ -1,7 +1,11 @@
 NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)
 MAKEFLAGS += -j$(NPROCS)
 
-BUILD_VERSION=
+BUILD_VERSION?=
+ARCHIVE_SUFFIX:=
+ifdef BUILD_VERSION
+	ARCHIVE_SUFFIX:=-$(BUILD_VERSION)
+endif
 
 BUILD_DIR=build
 BUILD_LIN_AMD64_DIR=$(BUILD_DIR)/linux/amd64
@@ -184,13 +188,13 @@ endif
 # ---- ARCHIVE ----
 
 .PHONY: archive
-archive: $(BUILD_DIR)/gomp-linux-amd64.tar.gz $(BUILD_DIR)/gomp-linux-arm.tar.gz $(BUILD_DIR)/gomp-linux-arm64.tar.gz $(BUILD_DIR)/gomp-windows-amd64.zip
+archive: $(BUILD_DIR)/gomp-linux-amd64$(ARCHIVE_SUFFIX).tar.gz $(BUILD_DIR)/gomp-linux-arm$(ARCHIVE_SUFFIX).tar.gz $(BUILD_DIR)/gomp-linux-arm64$(ARCHIVE_SUFFIX).tar.gz $(BUILD_DIR)/gomp-windows-amd64$(ARCHIVE_SUFFIX).zip
 
-$(BUILD_DIR)/gomp-linux-amd64.tar.gz: $(BUILD_LIN_AMD64_DIR)
-$(BUILD_DIR)/gomp-linux-arm.tar.gz: $(BUILD_LIN_ARM_DIR)
-$(BUILD_DIR)/gomp-linux-arm64.tar.gz: $(BUILD_LIN_ARM64_DIR)
-$(BUILD_DIR)/gomp-linux-%.tar.gz:
+$(BUILD_DIR)/gomp-linux-amd64$(ARCHIVE_SUFFIX).tar.gz: $(BUILD_LIN_AMD64_DIR)
+$(BUILD_DIR)/gomp-linux-arm$(ARCHIVE_SUFFIX).tar.gz: $(BUILD_LIN_ARM_DIR)
+$(BUILD_DIR)/gomp-linux-arm64$(ARCHIVE_SUFFIX).tar.gz: $(BUILD_LIN_ARM64_DIR)
+$(BUILD_DIR)/gomp-linux-%$(ARCHIVE_SUFFIX).tar.gz:
 	tar -C $< -zcf $@ .
 
-$(BUILD_DIR)/gomp-windows-amd64.zip: $(BUILD_WIN_AMD64_DIR)
+$(BUILD_DIR)/gomp-windows-amd64$(ARCHIVE_SUFFIX).zip: $(BUILD_WIN_AMD64_DIR)
 	cd $< && zip -rq ../../../$@ *