Fix GH Actions env var deprecation

Author: mattolenik

.github/workflows/release.yml

@@ -17,21 +17,14 @@ jobs:
         with:
           go-version: 1.17.x
 
-      - name: Get release version
-        id: get_version
-        run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:10})
-
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get CloudFlare Token
-        run: echo ::set-env name=CLOUDFLARE_TOKEN::${{ secrets.CLOUDFLARE_TOKEN }}
-
-      - name: Get Test Domain Name
-        run: echo ::set-env name=TEST_DOMAIN::${{ secrets.TEST_DOMAIN }}
-
       - name: Test and Build
         run: make test all shasums
+        env:
+          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
+          TEST_DOMAIN: ${{ secrets.TEST_DOMAIN }}
 
       - name: Release
         uses: softprops/action-gh-release@v1

.github/workflows/tests.yml

@@ -19,19 +19,22 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Get uname
-        run: echo ::set-env name=UNAME::$(uname)
-      - name: Get CloudFlare Token
-        run: echo ::set-env name=CLOUDFLARE_TOKEN::${{ secrets.CLOUDFLARE_TOKEN }}
-      - name: Get Test Domain Name
-        run: echo ::set-env name=TEST_DOMAIN::${{ secrets.TEST_DOMAIN }}
+        run: echo UNAME=$(uname) >> $GITHUB_ENV
+
       - name: Install Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.15.x
+
       - name: Checkout Code
         uses: actions/checkout@v2
+
       - name: Test
         run: make test coverage
+        env:
+          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
+          TEST_DOMAIN: ${{ secrets.TEST_DOMAIN }}
+
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@master
         with:
@@ -43,6 +46,7 @@ jobs:
           files: dist/test-results-${{ env.UNAME }}.xml
           report_individual_runs: true
           deduplicate_classes_by_file_name: false
+
       - name: Publish Code Coverage
         uses: shogo82148/actions-goveralls@v1.4.2
         with:
@@ -57,8 +61,10 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.15.x
+
       - name: Checkout Code
         uses: actions/checkout@v2
+
       - name: Test
         run: |
           $env:TEST_DOMAIN = '${{ secrets.TEST_DOMAIN }}'

Makefile

@@ -3,8 +3,6 @@
 MODULE               := $(shell awk 'NR==1{print $$2}' go.mod)
 REPO_NAME            := cloudflare-ddns
 VERSION              := $(shell echo $$(ver=$$(git tag -l --points-at HEAD) && [ -z $$ver ] && ver=$$(git describe --always --dirty); printf $$ver))
-# This is set during CI in .github/workflows/release.yml
-RELEASE_VERSION      ?= $(VERSION)
 LDFLAGS              := -s -w -X $(MODULE)/conf.Version=$(VERSION) -X $(MODULE)/conf.ModuleName=$(MODULE)
 FLAGS                := -trimpath
 PROJECT_ROOT         := $(shell cd -P -- '$(shell dirname -- "$0")' && pwd -P)
@@ -20,19 +18,21 @@ DOCKER_PLATFORMS     ?= linux/amd64 linux/arm64
 DOCKER_REPO          ?= mattolenik
 DOCKER_TAG           ?= $(DOCKER_REPO)/cloudflare-ddns-client
 DOCKER_TAG_LATEST    := $(DOCKER_TAG):latest
-DOCKER_TAG_VERSIONED := $(DOCKER_TAG):$(RELEASE_VERSION)
+DOCKER_TAG_VERSIONED := $(DOCKER_TAG):$(VERSION)
+export TEST_BINARY   := $(DIST)/$(BIN_NAME)
 
-export TEST_BINARY := $(DIST)/$(BIN_NAME)
+default: check-version all shasums readme test
 
-default: all shasums readme test
+check-version:
+	if [ -z "$(VERSION)" ]; then echo "VERSION variable must be set"; exit 1; fi
 
 build: $(DIST)/$(BIN_NAME)
 $(DIST)/$(BIN_NAME): $(SOURCE)
 	go build $(ARGS) $(FLAGS) -ldflags="$(LDFLAGS)" -o $@
 
 all: $(addprefix $(DIST)/$(BIN_NAME)-,$(PLATFORMS))
 
-docker-publish:
+docker-publish: check-version
 	docker buildx build --push --tag $(DOCKER_TAG_LATEST) --tag $(DOCKER_TAG_VERSIONED) --platform linux/amd64,linux/arm64 .
 
 clean: