bmclib version 2

.github/mergify.yml

@@ -1,4 +1,4 @@
-queue_rules:
+queue_rule:
   - name: default
     conditions:
       # Conditions to get out of the queue (= merged)
@@ -8,11 +8,11 @@ queue_rules:
 pull_request_rules:
   - name: Automatic merge on approval
     conditions:
-      - base=master
+      - base=v2
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
-      - check-success=lint
-      - check-success=test
+      - check-success='lint'
+      - check-success='test'
       - label!=do-not-merge
       - label=ready-to-merge
     actions:
@@ -21,4 +21,3 @@ pull_request_rules:
         name: default
         commit_message_template: |
           {{ title }} (#{{ number }})
-

.github/workflows/ci.yaml

@@ -14,14 +14,12 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: '1.18'
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
         args: -v --config .golangci.yml --timeout=5m
         version: latest
-    - name: goimports-check
-      run: go get golang.org/x/tools/cmd/goimports && make goimports-check
     - name: make all-checks
       run: make all-checks
   test:
@@ -36,8 +34,8 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: '1.18'
     - name: make all-tests
       run: make all-tests
     - name: upload codecov
-      run: bash <(curl -s https://codecov.io/bash)
+      run: bash <(curl -s https://codecov.io/bash)

.golangci.yml

@@ -1,8 +1,8 @@
   govet:
+    auto-fix: true
     linters-settings:
-    # TODO: enable and fix struct alignments
-    #enable:
-    #  - fieldalignment
+    enable:
+     - fieldalignment
     check-shadowing: true
     settings:
       printf:
@@ -48,8 +48,6 @@
     auto-fix: true
   wsl:
     auto-fix: true
-  govet:
-    auto-fix: true
   stylecheck:
     auto-fix: true
 
@@ -59,7 +57,7 @@ linters:
     - gosimple
     - govet
     - gofmt
-      #- gocyclo
+    - gocyclo
     - ineffassign
     - stylecheck
     - deadcode
@@ -77,9 +75,8 @@ linters:
     - goimports
     - golint
     - misspell
-    # enable when we're ready
-      #- goerr113
-      #- noctx
+    - goerr113
+    - noctx
   enable-all: false
   disable-all: true
 

Makefile

@@ -18,17 +18,7 @@ lint: ## Run linting
 	@echo be sure golangci-lint is installed: https://golangci-lint.run/usage/install/
 	golangci-lint run --config .golangci.yml
 
-.PHONY: goimports
-goimports: ## run goimports updating files in place
-	@echo be sure goimports is installed
-	goimports -w .
-
-.PHONY: goimports-check
-goimports-check: ## run goimports displaying diffs
-	@echo be sure goimports is installed
-	goimports -d . | (! grep .)
-
 .PHONY: all-checks
-all-checks: lint goimports ## run all formatters
+all-checks: lint ## run all formatters
 	go mod tidy
 	go vet ./...