remove s390x (#381)

.drone.yml

@@ -100,54 +100,6 @@ volumes:
   host:
     path: /var/run/docker.sock
 
----
-
-kind: pipeline
-name: s390x
-
-platform:
-  os: linux
-  arch: amd64
-
-node:
-  arch: s390x
-
-steps:
-  - name: build
-    image: rancher/dapper:v0.5.8
-    commands:
-      - dapper ci
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-
-  - name: docker-publish
-    image: rancher/drone-images:docker-s390x
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    settings:
-      dockerfile: package/Dockerfile
-      password:
-        from_secret: docker_password
-      repo: "rancher/gitjob"
-      tag: "${DRONE_TAG}-s390x"
-      username:
-        from_secret: docker_username
-    when:
-      instance:
-        - drone-publish.rancher.io
-      ref:
-        - refs/head/master
-        - refs/tags/*
-      event:
-        - tag
-
-volumes:
-  - name: docker
-    host:
-      path: /var/run/docker.sock
-
 ---
 kind: pipeline
 name: manifest
@@ -167,7 +119,6 @@ steps:
     platforms:
       - linux/amd64
       - linux/arm64
-      - linux/s390x
     target: "rancher/gitjob:${DRONE_TAG}"
     template: "rancher/gitjob:${DRONE_TAG}-ARCH"
   when:
@@ -182,4 +133,3 @@ steps:
 depends_on:
 - amd64
 - arm64
-- s390x

.golangci.json

@@ -15,6 +15,20 @@
       "unused"
     ]
   },
+  "linters-settings": {
+    "revive": {
+      "rules": [
+        {
+          "name": "blank-imports",
+          "severity": "warning"
+        },
+        {
+          "name": "unexported-return",
+          "severity": "warning"
+        }
+      ]
+    }
+  },
   "run": {
     "skip-files": [
       "/zz_generated_"

Dockerfile.dapper

@@ -7,7 +7,7 @@ ENV HELM_URL_V3=https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
 
 RUN zypper -n install git docker vim wget
 RUN if [ "${ARCH}" == "amd64" ]; then \
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2; \
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.1; \
     fi
 RUN mkdir /usr/tmp && \
     curl ${HELM_URL_V3} | tar xvzf - --strip-components=1 -C /usr/tmp/ && \

cmd/gitcloner/gogit/cloner_test.go

@@ -14,9 +14,10 @@ import (
 
 func TestCloneRepo(t *testing.T) {
 	const (
-		passwordFile             = "passFile"
-		passwordFileContent      = "1234"
-		sshPrivateKeyFile        = "sshFile"
+		passwordFile        = "passFile"
+		passwordFileContent = "1234"
+		sshPrivateKeyFile   = "sshFile"
+		//nolint:gosec //used for testing, not a real key
 		sshPrivateKeyFileContent = `-----BEGIN RSA PRIVATE KEY-----
 MIICXQIBAAKBgQC1ZuFGlFeAFqeS6p04QsliOXG3NH1/lQC4UMXdQ0F73ciYBPKq
 iQZcoyOu8a2Hsi5HvxDqR1rreTAkJ37C3ErrmKcE1CUJwxBVqkgE17Fzw63QBu0X

scripts/validate

@@ -9,7 +9,7 @@ if ! command -v golangci-lint; then	echo Running: go fmt
 fi
 
 echo Running: golangci-lint
-golangci-lint run
+golangci-lint run --config .golangci.json
 
 echo Verifying modules
 go mod verify