Merge branch 'trunk' into dependabot/go_modules/github.com/spf13/cobr…

…a-1.1.1

.github/workflows/release.yml

@@ -2,28 +2,35 @@ name: goreleaser
 
 on:
   push:
-    tags: 
-      - '*'
+    tags:
+      - "*"
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      -
-        name: Set up Go
+
+      - name: Set up Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.14
-      -
-        name: Run GoReleaser
+
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.PS_TOKEN }}
+
+      - name: Bump Homebrew formula
+        uses: mislav/bump-homebrew-formula-action@v1
+        if: "!contains(github.ref, '-')" # skip prereleases
+        with:
+          formula-name: glab
+        env:
+          COMMITTER_TOKEN: ${{ secrets.PS_TOKEN }}

.gitlab-ci.yml

@@ -42,9 +42,6 @@ code_navigation:
       lsif: dump.lsif
 
 .test:
-  # We limit concurrency because the integration tests execute _real_ actions in GitLab
-  # By limiting the resource group we can ensure that only one test is run in parallel
-  resource_group: test
   variables:
     GOPATH: "/builds/go"
     GIT_CLONE_PATH: $GOPATH/src/github.com/profclems/glab

.goreleaser.yml

@@ -37,12 +37,14 @@ archives:
       windows: Windows
       386: i386
       amd64: x86_64
+    allow_different_binary_count: true
 
   - id: nix
     builds: [macos, linux]
     <<: &archive_defaults
       name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     wrap_in_directory: false
+    allow_different_binary_count: true
     replacements:
       darwin: macOS
       linux: Linux
@@ -52,6 +54,7 @@ archives:
     builds: [windows]
     <<: *archive_defaults
     wrap_in_directory: false
+    allow_different_binary_count: true
     format: zip
 
 scoop:

Makefile

@@ -43,7 +43,7 @@ test: clean
 
 .PHONY: internal-test
 internal-test:
-	GO111MODULE=on go test -coverprofile=coverage-main.out -covermode=count -coverpkg ./... -run=$(run) $(GOURL)/cmd/glab $(GOURL)/commands/... $(GOURL)/internal/...
+	GO111MODULE=on go test -coverprofile=coverage-main.out -covermode=count -coverpkg ./... -run=$(run) $(GOURL)/cmd/glab $(GOURL)/commands/... $(GOURL)/internal/... $(GOURL)/pkg/...
 	go get -u github.com/wadey/gocovmerge
 	gocovmerge coverage-*.out > coverage.txt && rm coverage-*.out
 
@@ -62,4 +62,4 @@ release:
 .PHONY: gen-docs
 gen-docs:
 	go run ./cmd/gen-docs/docs.go
-	cp ./docs/glab.md ./docs/index.md
+	#cp ./docs/glab.rst ./docs/index.rst