Merge branch 'main' into inspect

vmware-tanzu · May 2, 2023 · d1b3ac5 · d1b3ac5
2 parents 2563fce + d65fe98
commit d1b3ac5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci-lint.yaml b/.github/workflows/ci-lint.yaml
@@ -8,10 +8,10 @@ jobs:
       - name: golangci-lint run
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50
+          version: v1.52.2
           skip-pkg-cache: true
-          skip-build-cache: true -h
-          args: --timeout=2m0s -v --disable staticcheck
+          skip-build-cache: true
+          args: --timeout=5m0s -v
   bash-lint:
     runs-on: ubuntu-latest
     steps:

diff --git a/scripts/build_funcs.sh b/scripts/build_funcs.sh
@@ -35,7 +35,7 @@ PPC64LE_IMAGE=gcr.io/distroless/static:nonroot-ppc64le
 S390X_IMAGE=gcr.io/distroless/static:nonroot-s390x
 WIN_AMD64_BASEIMAGE=mcr.microsoft.com/windows/nanoserver
 TEST_IMAGE=testimage:v0.1
-LINT_IMAGE=golangci/golangci-lint:v1.50
+LINT_IMAGE=golangci/golangci-lint:v1.52.2
 KIND_CLUSTER=kind
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"
@@ -85,7 +85,7 @@ local_integration(){
 
 lint() {
   docker run --rm -v "$(pwd)":$BUILDMNT -w $BUILDMNT $LINT_IMAGE /bin/sh -c \
-    "golangci-lint run --out-format=github-actions --timeout=2m0s -v"
+    "golangci-lint run --out-format=github-actions --timeout=5m0s -v"
 }
 
 vet() {

diff --git a/site/themes/sonobuoy/layouts/partials/footer.html b/site/themes/sonobuoy/layouts/partials/footer.html
@@ -12,7 +12,8 @@
 			</div>
 		</div>
 		<div class="bottom-links">
-			<p class="copywrite">&copy; {{ now.Year }} Authors. <a href="http://vmware.github.io/">A VMware-backed project. <img src="/img/vmware-logo.svg" alt="VMware logo" /></a></p>
+			<p class="copywrite">&copy; {{ now.Year }} Authors. <a href="http://vmware.github.io/">A VMware-backed project. <img src="/img/vmware-logo.svg" alt="VMware logo" /></a>
+			<br/>This Website Does Not Use Cookies or Other Tracking Technology</p>
 		</div>
 	</div>
 </footer>