Upgrade dependencies, Go 1.19 and CI (#21)

* upgrade dependencies
* update Go and CI

Author: pablo-ruth

.github/workflows/pr.yml

@@ -5,24 +5,22 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.15
-        uses: actions/setup-go@v1
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
-          go-version: 1.15
-        id: go
+          fetch-depth: 0
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v1
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+
+      - name: Run Golang CI Lint
+        uses: golangci/golangci-lint-action@v2
 
       - name: Build
         run: CGO_ENABLED=0 go build -ldflags="-w -s" -o gogci
 
-      - name: Setup Lint
-        run: curl -LO https://github.com/golangci/golangci-lint/releases/download/v1.23.6/golangci-lint-1.23.6-linux-amd64.tar.gz && tar -xf golangci-lint-1.23.6-linux-amd64.tar.gz
-
-      - name: Lint
-        run: golangci-lint-1.23.6-linux-amd64/golangci-lint run
-
       - name: Upload artifact
         uses: actions/upload-artifact@v1
         with:

.github/workflows/tag.yml

@@ -9,28 +9,26 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.15
-        uses: actions/setup-go@v1
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
-          go-version: 1.15
-        id: go
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+
+      - name: Run Golang CI Lint
+        uses: golangci/golangci-lint-action@v2
 
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v1
-
       - name: Build
         run: CGO_ENABLED=0 go build -ldflags="-w -s" -o gogci
 
-      - name: Setup Lint
-        run: curl -LO https://github.com/golangci/golangci-lint/releases/download/v1.23.6/golangci-lint-1.23.6-linux-amd64.tar.gz && tar -xf golangci-lint-1.23.6-linux-amd64.tar.gz
-
-      - name: Lint
-        run: golangci-lint-1.23.6-linux-amd64/golangci-lint run
-
       - name: Setup UPX
         run: curl -LO https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz && tar -xf upx-3.96-amd64_linux.tar.xz
 

gitlab/approval.go

@@ -12,10 +12,9 @@ import (
 func (c *Client) CheckMergeRequestApproved() (bool, error) {
 
 	// Init gitlab client
-	git := gitlab.NewClient(nil, c.Token)
-	err := git.SetBaseURL(c.URL)
+	git, err := gitlab.NewClient(c.Token, gitlab.WithBaseURL(c.URL))
 	if err != nil {
-		return false, fmt.Errorf("failed to set Gitlab client URL: %w", err)
+		return false, fmt.Errorf("failed to init Gitlab client: %w", err)
 	}
 
 	// Get project and merge request IDs from Gitlab CI env vars

gitlab/mr.go

@@ -12,10 +12,9 @@ import (
 func (c *Client) CheckOldestMergeRequest() (bool, error) {
 
 	// Init gitlab client
-	git := gitlab.NewClient(nil, c.Token)
-	err := git.SetBaseURL(c.URL)
+	git, err := gitlab.NewClient(c.Token, gitlab.WithBaseURL(c.URL))
 	if err != nil {
-		return false, fmt.Errorf("failed to set gitlab client base url: %w", err)
+		return false, fmt.Errorf("failed to init Gitlab client: %w", err)
 	}
 
 	// Get project and merge request IDs from Gitlab CI env vars

gitlab/notify.go

@@ -16,10 +16,9 @@ import (
 func (c *Client) CreateMergeRequestNote(tmpl string, data interface{}) error {
 
 	// Init gitlab client
-	git := gitlab.NewClient(nil, c.Token)
-	err := git.SetBaseURL(c.URL)
+	git, err := gitlab.NewClient(c.Token, gitlab.WithBaseURL(c.URL))
 	if err != nil {
-		return fmt.Errorf("failed to set gitlab client base url: %w", err)
+		return fmt.Errorf("failed to init gitlab client: %w", err)
 	}
 
 	// Init template

go.mod

@@ -3,13 +3,13 @@ module github.com/Ouest-France/gogci
 go 1.14
 
 require (
-	github.com/Masterminds/sprig/v3 v3.1.0
+	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
-	github.com/fatih/color v1.9.0
-	github.com/hashicorp/vault/api v1.0.4
+	github.com/fatih/color v1.13.0
+	github.com/hashicorp/vault/api v1.7.2
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/spf13/cobra v0.0.6
-	github.com/spf13/viper v1.6.2
-	github.com/xanzy/go-gitlab v0.28.0
-	gopkg.in/ini.v1 v1.54.0
+	github.com/spf13/cobra v1.5.0
+	github.com/spf13/viper v1.12.0
+	github.com/xanzy/go-gitlab v0.70.0
+	gopkg.in/ini.v1 v1.66.6
 )