From 4510d3d1f59fe68484faa332e9cf7867b593ca02 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Sun, 28 Jul 2024 21:48:18 +0300 Subject: [PATCH] ci: adjust [CI SKIP] --- .woodpecker/.build.yml | 12 ++++-------- .woodpecker/.latest.yml | 6 ------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 846ea06..d8b42be 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -5,7 +5,7 @@ when: variables: - &image_name 'quay.krd.sh/krd/woodpecker-sonatype-nexus' - &ext_image_name 'docker.io/rockdrilla/woodpecker-sonatype-nexus' - - &buildah_image 'quay.krd.sh/quay_io/containers/buildah:v1.35.4' + - &buildah_image 'quay.krd.sh/quay_io/containers/buildah:v1.36.0' - &skopeo_image 'quay.krd.sh/quay_io/containers/skopeo:v1.15.2' - &go_image 'quay.krd.sh/golang:1.22.5-bookworm' - &base_image 'quay.krd.sh/gcr_io/distroless/static-debian12:debug-nonroot' @@ -13,12 +13,6 @@ variables: ## ref: https://github.com/GoogleContainerTools/distroless#debian-12 - &target_platforms 'linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x' -## kind of fixup (remove in near future) -## ref: https://github.com/woodpecker-ci/plugin-git/releases -clone: - git: - image: quay.krd.sh/docker_io/woodpeckerci/plugin-git:2.5.1 - ## NB: ${variable} expressions are subject to pre-processing. ## ref: https://woodpecker-ci.org/docs/usage/environment @@ -36,12 +30,14 @@ steps: - name: build-all image: *go_image environment: + GOPROXY: "${GOPROXY},direct" + GOSUMDB: "${GOSUMDB}" + GOPRIVATE: "${GOPRIVATE}" GOMAXPROCS: "2" MALLOC_ARENA_MAX: "4" ## TARGET_PLATFORMS: *target_platforms ## these secrets are server-wide - secrets: [ GOPRIVATE, GOPROXY, GOSUMDB ] commands: - .ci/build-all.sh diff --git a/.woodpecker/.latest.yml b/.woodpecker/.latest.yml index 3add2a1..18c7d43 100644 --- a/.woodpecker/.latest.yml +++ b/.woodpecker/.latest.yml @@ -7,12 +7,6 @@ variables: - &ext_image_name 'docker.io/rockdrilla/woodpecker-sonatype-nexus' - &skopeo_image 'quay.krd.sh/quay_io/containers/skopeo:v1.15.2' -## kind of fixup (remove in near future) -## ref: https://github.com/woodpecker-ci/plugin-git/releases -clone: - git: - image: quay.krd.sh/docker_io/woodpeckerci/plugin-git:2.5.1 - ## NB: ${variable} expressions are subject to pre-processing. ## ref: https://woodpecker-ci.org/docs/usage/environment