Upgrade golangci-lint

Signed-off-by: Tim Ebert <[email protected]>
corneliusweig · Dec 6, 2023 · 4bb1014 · 4bb1014
1 parent cfaf8d4
commit 4bb1014
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 40 deletions.
diff --git a/hack/install_golangci-lint.sh b/hack/install_golangci-lint.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 set -e
-# Code generated by godownloader on 2019-02-21T21:16:54Z. DO NOT EDIT.
-#
 
 usage() {
   this=$1
@@ -43,44 +41,72 @@ parse_args() {
 # network, either nothing will happen or will syntax error
 # out preventing half-done work
 execute() {
-  tmpdir=$(mktmpdir)
+  tmpdir=$(mktemp -d)
   log_debug "downloading files into ${tmpdir}"
   http_download "${tmpdir}/${TARBALL}" "${TARBALL_URL}"
   http_download "${tmpdir}/${CHECKSUM}" "${CHECKSUM_URL}"
   hash_sha256_verify "${tmpdir}/${TARBALL}" "${tmpdir}/${CHECKSUM}"
   srcdir="${tmpdir}/${NAME}"
   rm -rf "${srcdir}"
   (cd "${tmpdir}" && untar "${TARBALL}")
-  install -d "${BINDIR}"
-  for binexe in "golangci-lint" ; do
+  test ! -d "${BINDIR}" && install -d "${BINDIR}"
+  for binexe in $BINARIES; do
     if [ "$OS" = "windows" ]; then
       binexe="${binexe}.exe"
     fi
     install "${srcdir}/${binexe}" "${BINDIR}/"
     log_info "installed ${BINDIR}/${binexe}"
   done
-}
-is_supported_platform() {
-  platform=$1
-  found=1
-  case "$platform" in
-    darwin/amd64) found=0 ;;
-    darwin/386) found=0 ;;
-    windows/amd64) found=0 ;;
-    windows/386) found=0 ;;
-    linux/amd64) found=0 ;;
-    linux/386) found=0 ;;
+  rm -rf "${tmpdir}"
+}
+get_binaries() {
+  case "$PLATFORM" in
+    darwin/amd64) BINARIES="golangci-lint" ;;
+    darwin/arm64) BINARIES="golangci-lint" ;;
+    darwin/armv6) BINARIES="golangci-lint" ;;
+    darwin/armv7) BINARIES="golangci-lint" ;;
+    darwin/mips64) BINARIES="golangci-lint" ;;
+    darwin/mips64le) BINARIES="golangci-lint" ;;
+    darwin/ppc64le) BINARIES="golangci-lint" ;;
+    darwin/s390x) BINARIES="golangci-lint" ;;
+    freebsd/386) BINARIES="golangci-lint" ;;
+    freebsd/amd64) BINARIES="golangci-lint" ;;
+    freebsd/armv6) BINARIES="golangci-lint" ;;
+    freebsd/armv7) BINARIES="golangci-lint" ;;
+    freebsd/mips64) BINARIES="golangci-lint" ;;
+    freebsd/mips64le) BINARIES="golangci-lint" ;;
+    freebsd/ppc64le) BINARIES="golangci-lint" ;;
+    freebsd/s390x) BINARIES="golangci-lint" ;;
+    illumos/amd64) BINARIES="golangci-lint" ;;
+    linux/386) BINARIES="golangci-lint" ;;
+    linux/amd64) BINARIES="golangci-lint" ;;
+    linux/arm64) BINARIES="golangci-lint" ;;
+    linux/armv6) BINARIES="golangci-lint" ;;
+    linux/armv7) BINARIES="golangci-lint" ;;
+    linux/mips64) BINARIES="golangci-lint" ;;
+    linux/mips64le) BINARIES="golangci-lint" ;;
+    linux/ppc64le) BINARIES="golangci-lint" ;;
+    linux/s390x) BINARIES="golangci-lint" ;;
+    linux/riscv64) BINARIES="golangci-lint" ;;
+    linux/loong64) BINARIES="golangci-lint" ;;
+    netbsd/386) BINARIES="golangci-lint" ;;
+    netbsd/amd64) BINARIES="golangci-lint" ;;
+    netbsd/armv6) BINARIES="golangci-lint" ;;
+    netbsd/armv7) BINARIES="golangci-lint" ;;
+    windows/386) BINARIES="golangci-lint" ;;
+    windows/amd64) BINARIES="golangci-lint" ;;
+    windows/arm64) BINARIES="golangci-lint" ;;
+    windows/armv6) BINARIES="golangci-lint" ;;
+    windows/armv7) BINARIES="golangci-lint" ;;
+    windows/mips64) BINARIES="golangci-lint" ;;
+    windows/mips64le) BINARIES="golangci-lint" ;;
+    windows/ppc64le) BINARIES="golangci-lint" ;;
+    windows/s390x) BINARIES="golangci-lint" ;;
+    *)
+      log_crit "platform $PLATFORM is not supported.  Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new"
+      exit 1
+      ;;
   esac
-  return $found
-}
-check_platform() {
-  if is_supported_platform "$PLATFORM"; then
-    # optional logging goes here
-    true
-  else
-    log_crit "platform $PLATFORM is not supported.  Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new"
-    exit 1
-  fi
 }
 tag_to_version() {
   if [ -z "${TAG}" ]; then
@@ -98,8 +124,8 @@ tag_to_version() {
   VERSION=${TAG#v}
 }
 adjust_format() {
-  # change format (tar.gz or zip) based on ARCH
-  case ${ARCH} in
+  # change format (tar.gz or zip) based on OS
+  case ${OS} in
     windows) FORMAT=zip ;;
   esac
   true
@@ -173,7 +199,11 @@ log_crit() {
 uname_os() {
   os=$(uname -s | tr '[:upper:]' '[:lower:]')
   case "$os" in
-    msys_nt) os="windows" ;;
+    msys*) os="windows" ;;
+    mingw*) os="windows" ;;
+    cygwin*) os="windows" ;;
+    win*) os="windows" ;;
+    sunos) [ $(uname -o) == "illumos" ] && os=illumos ;;
   esac
   echo "$os"
 }
@@ -184,10 +214,12 @@ uname_arch() {
     x86) arch="386" ;;
     i686) arch="386" ;;
     i386) arch="386" ;;
+    i86pc) arch="amd64" ;;
     aarch64) arch="arm64" ;;
     armv5*) arch="armv5" ;;
     armv6*) arch="armv6" ;;
     armv7*) arch="armv7" ;;
+    loongarch64) arch="loong64" ;;
   esac
   echo ${arch}
 }
@@ -197,6 +229,7 @@ uname_os_check() {
     darwin) return 0 ;;
     dragonfly) return 0 ;;
     freebsd) return 0 ;;
+    illumos) return 0;;
     linux) return 0 ;;
     android) return 0 ;;
     nacl) return 0 ;;
@@ -206,7 +239,7 @@ uname_os_check() {
     solaris) return 0 ;;
     windows) return 0 ;;
   esac
-  log_crit "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value. Please file bug at https://github.com/client9/shlib"
+  log_crit "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value."
   return 1
 }
 uname_arch_check() {
@@ -225,28 +258,25 @@ uname_arch_check() {
     mips64) return 0 ;;
     mips64le) return 0 ;;
     s390x) return 0 ;;
+    riscv64) return 0 ;;
     amd64p32) return 0 ;;
+    loong64) return 0 ;;
   esac
-  log_crit "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value.  Please file bug report at https://github.com/client9/shlib"
+  log_crit "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value."
   return 1
 }
 untar() {
   tarball=$1
   case "${tarball}" in
-    *.tar.gz | *.tgz) tar -xzf "${tarball}" ;;
-    *.tar) tar -xf "${tarball}" ;;
+    *.tar.gz | *.tgz) tar --no-same-owner -xzf "${tarball}" ;;
+    *.tar) tar --no-same-owner -xf "${tarball}" ;;
     *.zip) unzip "${tarball}" ;;
     *)
       log_err "untar unknown archive format for ${tarball}"
       return 1
       ;;
   esac
 }
-mktmpdir() {
-  test -z "$TMPDIR" && TMPDIR="$(mktemp -d)"
-  mkdir -p "${TMPDIR}"
-  echo "${TMPDIR}"
-}
 http_download_curl() {
   local_file=$1
   source_url=$2
@@ -367,7 +397,7 @@ uname_arch_check "$ARCH"
 
 parse_args "$@"
 
-check_platform
+get_binaries
 
 tag_to_version
 

diff --git a/hack/run_lint.sh b/hack/run_lint.sh
@@ -22,7 +22,7 @@ export GOPATH="$(go env GOPATH)"
 if ! [[ -x "$GOPATH/bin/golangci-lint" ]]
 then
    echo 'Installing golangci-lint'
-   "${HACK}"/install_golangci-lint.sh -b "$GOPATH/bin" v1.41.1
+   "${HACK}"/install_golangci-lint.sh -b "$GOPATH/bin" v1.55.2
 fi
 
 "$GOPATH/bin/golangci-lint" run \