feat(CI/CD): support labels in tag name (#36)

Author: paologallinaharbur

.github/workflows/release.yml

@@ -28,14 +28,12 @@ jobs:
       run: |
         $ErrorView = 'NormalView'
         [Environment]::SetEnvironmentVariable("path", "$env:path;$env:GOPATH\bin", "Machine")
-        $semanticVersion = "${{ github.event.release.tag_name }}" -replace '[v]',''
-        .\win_build.ps1 -arch ${{ matrix.goarch }} -version $semanticVersion
+        .\win_build.ps1 -arch ${{ matrix.goarch }} -version ${{ github.event.release.tag_name }}
     - name: Create Tar and Zip
       shell: bash
       run: |
         cp winservices-config.yml.sample ./target/bin/windows_${{ matrix.goarch }}
-        tar -czvf ${{ github.event.repository.name }}-${{ matrix.goarch }}.tar.gz ./target/bin/windows_${{ matrix.goarch }}/*
-        7z a ${{ github.event.repository.name }}-${{ matrix.goarch }}.zip ./target/bin/windows_${{ matrix.goarch }}/*
+        7z a ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-${{ matrix.goarch }}.zip ./target/bin/windows_${{ matrix.goarch }}/*
     - name: Upload Integration binary
       uses: actions/upload-release-asset@v1.0.1
       env:
@@ -54,21 +52,12 @@ jobs:
         asset_path: .\target\bin\windows_${{ matrix.goarch }}\windows_exporter.exe
         asset_name: windows-exporter-${{ matrix.goarch }}.exe
         asset_content_type: Exporter binary
-    - name: Upload Tarball
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./${{ github.event.repository.name }}-${{ matrix.goarch }}.tar.gz
-        asset_name: ${{ github.event.repository.name }}-${{ matrix.goarch }}.tar.gz
-        asset_content_type: Integration Tarball
     - name: Upload Zip
       uses: actions/upload-release-asset@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./${{ github.event.repository.name }}-${{ matrix.goarch }}.zip
-        asset_name: ${{ github.event.repository.name }}-${{ matrix.goarch }}.zip
-        asset_content_type: Integration Tarball
+        asset_path: ./${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-${{ matrix.goarch }}.zip
+        asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-${{ matrix.goarch }}.zip
+        asset_content_type: Integration Zip

.gitignore

@@ -2,4 +2,5 @@ coverage.xml
 bin
 .idea
 .vscode
-*.exe
+*.exe
+*.msi

src/winservices.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/newrelic/infra-integrations-sdk/integration"
 	"github.com/newrelic/infra-integrations-sdk/log"
+
 	//This import is useful merely to keep track of dependency and generate license automatically
 	_ "github.com/prometheus-community/windows_exporter/collector"
 )
@@ -33,7 +34,7 @@ const (
 
 var (
 	args               argumentList
-	integrationVersion = "0.0.0"   // set by -ldflags on build
+	integrationVersion = "v0.0.0"  // set by -ldflags on build
 	commitHash         = "default" // Commit hash used to build the integration set by -ldflags on build
 )
 

test/json-schema-files/winservices-schema.json

@@ -14,7 +14,7 @@
           "type": "string"
         },
         "version": {
-          "pattern": "^[0-9]+.[0-9]+.[0-9]+$",
+          "pattern": "^v[0-9]+.[0-9]+.[0-9]+(-beta)?$",
           "type": "string"
         }
       },

win_build.ps1

@@ -6,7 +6,7 @@ param (
     # Target architecture: amd64 (default) or 386
     [ValidateSet("amd64", "386")]
     [string]$arch="amd64",
-    [string]$version="0.0.0",
+    [string]$version="v0.0.0",
     # Skip tests
     [switch]$skipTests=$false,
     [switch]$skipExporterCompile=$false
@@ -32,20 +32,6 @@ $env:GOOS = "windows"
 $env:GOARCH = $arch
 $env:GO111MODULE = "auto"
 
-# verifying version number format
-$v = $version.Split(".")
-
-if ($v.Length -ne 3) {
-    echo "-version must follow a numeric major.minor.patch semantic versioning schema (received: $version)"
-    exit -1
-}
-
-$wrong = $v | ? { (-Not [System.Int32]::TryParse($_, [ref]0)) -or ( $_.Length -eq 0) -or ([int]$_ -lt 0)} | % { 1 }
-if ($wrong.Length  -ne 0) {
-    echo "-version major, minor and patch must be valid positive integers (received: $version)"
-    exit -1
-}
-
 echo "--- Checking dependencies"
 # We are running a job in a windows that calls a .ps1 experiencing this issue. 
 # Basically when using git (and as well when running go get or go mod...) the powershell script fails misinterpreting the output