From 83a63ce09544e5da5edfe80313ff83abc5fbb5db Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Tue, 14 May 2024 05:02:14 +0000 Subject: [PATCH 1/3] Bump pipeline from 1.36.6 to 1.38.0 Bumps pipeline from 1.36.6 to 1.38.0. Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/dependabot.yml | 26 +++++++++---------------- .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 6 +++--- .github/workflows/pb-tests.yml | 6 +++--- .github/workflows/pb-update-go.yml | 2 ++ scripts/build.sh | 2 +- 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index add7f27..2adccd4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,19 +1,11 @@ version: 2 updates: - - package-ecosystem: gomod - directory: / - schedule: - interval: weekly - labels: - - semver:patch - - type:dependency-upgrade - allow: - - dependency-type: "all" - groups: - gomod: - patterns: - - "*" - # group all minor and patch dependency updates together - update-types: - - "minor" - - "patch" + - package-ecosystem: gomod + directory: / + schedule: + interval: daily + ignore: + - dependency-name: github.com/onsi/gomega + labels: + - semver:patch + - type:dependency-upgrade diff --git a/.github/pipeline-version b/.github/pipeline-version index f5b8b23..ebeef2f 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.36.6 +1.38.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index d425511..1e3ab13 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -106,7 +106,7 @@ jobs: run: | #!/usr/bin/env bash - set -xeuo pipefail + set -euo pipefail # With Go 1.20, we need to set this so that we produce statically compiled binaries # @@ -144,7 +144,7 @@ jobs: run: |- #!/usr/bin/env bash - set -xeuo pipefail + set -euo pipefail COMPILED_BUILDPACK="${HOME}/buildpack" @@ -188,7 +188,7 @@ jobs: else pack -v buildpack package \ "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" + --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") fi env: PACKAGES: docker.io/paketobuildpacks/pipeline-builder-canary gcr.io/paketo-buildpacks/pipeline-builder-canary diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index dca7ad5..d0a9087 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -93,7 +93,7 @@ jobs: run: | #!/usr/bin/env bash - set -xeuo pipefail + set -euo pipefail # With Go 1.20, we need to set this so that we produce statically compiled binaries # @@ -129,7 +129,7 @@ jobs: run: |- #!/usr/bin/env bash - set -xeuo pipefail + set -euo pipefail COMPILED_BUILDPACK="${HOME}/buildpack" @@ -173,7 +173,7 @@ jobs: else pack -v buildpack package \ "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" + --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") fi env: FORMAT: image diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index ce1a9e5..140a318 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -29,6 +29,8 @@ jobs: go mod edit -go="$GO_VERSION" go mod tidy + go get -u -t ./... + go mod tidy git add go.mod go.sum git checkout -- . diff --git a/scripts/build.sh b/scripts/build.sh index dc48240..11e6bd6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,7 +2,7 @@ set -euo pipefail GOMOD=$(head -1 go.mod | awk '{print $2}') -GOOS="linux" go build -ldflags='-s -w' -o linux/amd64/bin/main "$GOMOD/cmd/main" +GOOS="linux" GOARCH="amd64" go build -ldflags='-s -w' -o linux/amd64/bin/main "$GOMOD/cmd/main" GOOS="linux" GOARCH="arm64" go build -ldflags='-s -w' -o linux/arm64/bin/main "$GOMOD/cmd/main" if [ "${STRIP:-false}" != "false" ]; then From 41b86fed6dafc24d042ff5b3abbec472dd5f5d16 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Fri, 17 May 2024 23:09:40 -0400 Subject: [PATCH 2/3] Update .github/dependabot.yml --- .github/dependabot.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2adccd4..add7f27 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,19 @@ version: 2 updates: - - package-ecosystem: gomod - directory: / - schedule: - interval: daily - ignore: - - dependency-name: github.com/onsi/gomega - labels: - - semver:patch - - type:dependency-upgrade + - package-ecosystem: gomod + directory: / + schedule: + interval: weekly + labels: + - semver:patch + - type:dependency-upgrade + allow: + - dependency-type: "all" + groups: + gomod: + patterns: + - "*" + # group all minor and patch dependency updates together + update-types: + - "minor" + - "patch" From 47727209e4682d472ffe3b07f068ec0fbf4d8c94 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Fri, 17 May 2024 23:09:53 -0400 Subject: [PATCH 3/3] Update .github/workflows/pb-update-go.yml --- .github/workflows/pb-update-go.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index 26eebbe..fa8636e 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -29,8 +29,6 @@ jobs: go mod edit -go="$GO_VERSION" go mod tidy - go get -u -t ./... - go mod tidy git add go.mod go.sum git checkout -- .