[action] Remove MacOS from matrix

.github/workflows/build.yml

@@ -4,24 +4,43 @@ on: [pull_request]
 
 jobs:
 
+  test:
+    name: Test
+    env:
+      CGO_ENABLED: 0
+    strategy:
+      matrix:
+        go: [1.13.x]
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Set up Go ${{ matrix.go }}
+      uses: actions/setup-go@v2-beta
+      with:
+        go-version: ${{ matrix.go }}
+
+    - uses: actions/checkout@v2
+
+    - name: setup make (Windows)
+      if: matrix.os == 'windows-latest'
+      run: choco install make -y
+
+    - run: make test
+
   build:
     name: Build
     runs-on: ubuntu-latest
+    needs: test
+
     steps:
     - name: Set up Go 1.13
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2-beta
       with:
         go-version: 1.13
 
     - uses: actions/checkout@v2
-    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-    - name: Set GOPATH
-        # temporary fix
-        # see https://github.com/actions/setup-go/issues/14
-      run: |
-        echo "##[set-env name=GOPATH;]$(dirname $GITHUB_WORKSPACE)"
-        echo "##[add-path]$(dirname $GITHUB_WORKSPACE)/bin"
-      shell: bash
 
-    - run: make test
+    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+
     - run: make xbuild-all

.github/workflows/release.yml

@@ -12,19 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go 1.13
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2-beta
       with:
         go-version: 1.13
 
     - uses: actions/checkout@v2
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* # Needed in makefile for versioning
-    - name: Set GOPATH
-        # temporary fix
-        # see https://github.com/actions/setup-go/issues/14
-      run: |
-        echo "##[set-env name=GOPATH;]$(dirname $GITHUB_WORKSPACE)"
-        echo "##[add-path]$(dirname $GITHUB_WORKSPACE)/bin"
-      shell: bash
 
     - run: make test
     - run: make xbuild-all

pkg/qliksense/fetch.go

@@ -80,14 +80,9 @@ func fetchAndUpdateCR(qConfig *qapi.QliksenseConfig, version string) error {
 	}
 	if version == "" {
 		if qcr.GetLabelFromCr("version") == "" {
-			if encKey, err := qConfig.GetEncryptionKeyFor(qcr.GetName()); err != nil {
-				return err
-			} else if version, err = getLatestTag(qcr.GetFetchUrl(), qcr.GetFetchAccessToken(encKey)); err != nil {
-				return err
-			}
-		} else {
-			version = qcr.GetLabelFromCr("version")
+			return errors.New("Cannot find gitref/tag/branch/version to fetch")
 		}
+		version = qcr.GetLabelFromCr("version")
 	}
 	encKey, err := qConfig.GetEncryptionKeyFor(qcr.GetName())
 	if err != nil {

pkg/qliksense/fetch_test.go

@@ -32,19 +32,4 @@ func TestFetchAndUpdateCR(t *testing.T) {
 		t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.2")
 		t.FailNow()
 	}
-	//testing latest tag is fetched
-	cr.AddLabelToCr("version", "")
-	qConfig.WriteCR(cr)
-	err := fetchAndUpdateCR(qConfig, "")
-	if err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-	cr = &qapi.QliksenseCR{}
-	qapi.ReadFromFile(cr, actualCrFile)
-	v := cr.GetLabelFromCr("version")
-	if v == "" || v == "v0.0.2" {
-		t.Log("should get latest but got version: " + v)
-		t.Fail()
-	}
 }

pkg/qliksense/get_installable_versions.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/Masterminds/semver/v3"
 	"github.com/qlik-oss/k-apis/pkg/git"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
@@ -87,69 +86,3 @@ func (q *Qliksense) GetInstallableVersions(opts *LsRemoteCmdOptions) error {
 
 	return nil
 }
-
-func getLatestTag(repoUrl, accessToken string) (string, error) {
-	if repoUrl == "" {
-		return "", errors.New("repo url is empty")
-	}
-	repoPath, err := fetchToTempDir(repoUrl, "master", accessToken)
-	if err != nil {
-		return "", err
-	}
-
-	r, err := git.OpenRepository(repoPath)
-	if err != nil {
-		return "", err
-	}
-
-	remoteRefsList, err := git.GetRemoteRefs(r, nil,
-		&git.RemoteRefConstraints{
-			Include:   true,
-			Sort:      true,
-			SortOrder: git.RefSortOrderDescending,
-		},
-		&git.RemoteRefConstraints{
-			Include:   false,
-			Sort:      true,
-			SortOrder: git.RefSortOrderAscending,
-		})
-	if err != nil {
-		return "", err
-	}
-
-	if len(remoteRefsList) < 1 {
-		return "", errors.New("cannot find git remote information in the config repository")
-	}
-
-	var originRemoteRefs *git.RemoteRefs
-	for _, remoteRefs := range remoteRefsList {
-		if remoteRefs.Name == "origin" {
-			originRemoteRefs = remoteRefs
-			break
-		}
-	}
-	if originRemoteRefs == nil {
-		return "", errors.New(`cannot find git remote called "origin" in the config repository`)
-	}
-
-	tags := originRemoteRefs.Tags
-	if len(tags) == 0 {
-		return "", errors.New(("no tags exists in the repo: " + repoPath))
-	}
-	maxSem, _ := semver.NewVersion(tags[0])
-	for _, sv := range tags[1:] {
-		if sv == "" {
-			continue
-		}
-		v, err := semver.NewVersion(sv)
-		if err != nil {
-			// it may happen, in the repo some tags may not conform to semver
-			fmt.Print("Unconform tags: " + sv)
-			continue
-		}
-		if maxSem == nil || maxSem.LessThan(v) {
-			maxSem = v
-		}
-	}
-	return maxSem.Original(), nil
-}

pkg/qliksense/get_installable_versions_test.go

@@ -1,25 +0,0 @@
-package qliksense
-
-import (
-	"testing"
-
-	"github.com/Masterminds/semver/v3"
-)
-
-func TestGetLatestTag(t *testing.T) {
-	s, err := getLatestTag(defaultConfigRepoGitUrl, "")
-	if s == "" || err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-	sv, err := semver.NewVersion(s)
-	if err != nil {
-		t.Log(err)
-		t.Log(sv)
-	}
-	baseV, _ := semver.NewVersion("v0.0.7")
-	if !sv.GreaterThan(baseV) {
-		t.Log("Expected greater than v0.0.7, but got:  " + s)
-		t.Fail()
-	}
-}