From 55acaad43eb1417d308e2f6ed3a590b088b81a23 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Fri, 27 Oct 2023 13:31:18 +0000 Subject: [PATCH 1/9] Updating github-config --- .github/workflows/create-draft-release.yml | 10 +++++----- .github/workflows/lint.yml | 2 +- .github/workflows/test-pull-request.yml | 6 ++---- .../workflows/update-dependencies-from-metadata.yml | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml index 281809f..481e28d 100644 --- a/.github/workflows/create-draft-release.yml +++ b/.github/workflows/create-draft-release.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 - name: Run Unit Tests @@ -49,10 +49,9 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true - name: Run Integration Tests run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }} env: @@ -67,10 +66,11 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true + with: + fetch-tags: true - name: Reset Draft Release id: reset uses: paketo-buildpacks/github-config/actions/release/reset-draft@main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 130481f..d100818 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml index b41bd1e..487e1a2 100644 --- a/.github/workflows/test-pull-request.yml +++ b/.github/workflows/test-pull-request.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 @@ -49,13 +49,11 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Checkout uses: actions/checkout@v3 - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true - - name: Run Integration Tests run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }} env: diff --git a/.github/workflows/update-dependencies-from-metadata.yml b/.github/workflows/update-dependencies-from-metadata.yml index 905fe50..fc7008a 100644 --- a/.github/workflows/update-dependencies-from-metadata.yml +++ b/.github/workflows/update-dependencies-from-metadata.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 'stable' - name: Run Retrieve id: retrieve From eedcb6b0eddf08a61328533edeb3bf42cac1f272 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Wed, 8 Nov 2023 13:31:03 +0000 Subject: [PATCH 2/9] Updating github-config --- .github/workflows/create-draft-release.yml | 3 +-- .github/workflows/test-pull-request.yml | 3 +-- scripts/.util/git.sh | 21 -------------------- scripts/integration.sh | 23 ++++++++++------------ 4 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 scripts/.util/git.sh diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml index 481e28d..8474cab 100644 --- a/.github/workflows/create-draft-release.yml +++ b/.github/workflows/create-draft-release.yml @@ -53,9 +53,8 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Run Integration Tests - run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }} + run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }} env: - GIT_TOKEN: ${{ github.token }} TMPDIR: "${{ runner.temp }}" release: diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml index 487e1a2..6574ff7 100644 --- a/.github/workflows/test-pull-request.yml +++ b/.github/workflows/test-pull-request.yml @@ -55,9 +55,8 @@ jobs: uses: actions/checkout@v3 - name: Run Integration Tests - run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }} + run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }} env: - GIT_TOKEN: ${{ github.token }} TMPDIR: "${{ runner.temp }}" roundup: diff --git a/scripts/.util/git.sh b/scripts/.util/git.sh deleted file mode 100644 index 71965bc..0000000 --- a/scripts/.util/git.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -# shellcheck source=SCRIPTDIR/print.sh -source "$(dirname "${BASH_SOURCE[0]}")/print.sh" - -function util::git::token::fetch() { - if [[ -z "${GIT_TOKEN:-""}" ]]; then - util::print::title "Fetching GIT_TOKEN" - - GIT_TOKEN="$( - lpass show Shared-CF\ Buildpacks/concourse-private.yml \ - | grep buildpacks-github-token \ - | cut -d ' ' -f 2 - )" - fi - - printf "%s" "${GIT_TOKEN}" -} diff --git a/scripts/integration.sh b/scripts/integration.sh index 13a5635..8e98b15 100755 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -19,15 +19,12 @@ source "${PROGDIR}/.util/git.sh" source "${PROGDIR}/.util/builders.sh" function main() { - local builderArray + local builderArray token builderArray=() + token="" + while [[ "${#}" != 0 ]]; do case "${1}" in - --use-token|-t) - shift 1 - token::fetch - ;; - --help|-h) shift 1 usage @@ -39,6 +36,11 @@ function main() { shift 2 ;; + --token|-t) + token="${2}" + shift 2 + ;; + "") # skip if the argument is empty shift 1 @@ -53,7 +55,7 @@ function main() { util::print::warn "** WARNING No Integration tests **" fi - tools::install "${GIT_TOKEN:-}" + tools::install "${token}" if [ ${#builderArray[@]} -eq 0 ]; then util::print::title "No builders provided. Finding builders in integration.json..." @@ -93,9 +95,9 @@ Runs the integration test suite. OPTIONS --help -h prints the command usage - --use-token -t use GIT_TOKEN from lastpass --builder -b sets the name of the builder(s) that are pulled / used for testing. Defaults to "builders" array in integration.json, if present. + --token Token used to download assets from GitHub (e.g. jam, pack, etc) (optional) USAGE } @@ -144,11 +146,6 @@ function builder_images::pull() { docker pull "${lifecycle_image}" } -function token::fetch() { - GIT_TOKEN="$(util::git::token::fetch)" - export GIT_TOKEN -} - function tests::run() { util::print::title "Run Buildpack Runtime Integration Tests" util::print::info "Using ${1} as builder..." From 91aaa93751987efab467dac57ca90f4e91b793c3 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 9 Nov 2023 13:31:50 +0000 Subject: [PATCH 3/9] Updating github-config --- scripts/.util/tools.json | 2 +- scripts/integration.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index bce6071..46bdfc0 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { "createpackage": "v1.67.2", "jam": "v2.6.0", - "pack": "v0.31.0" + "pack": "v0.32.0" } diff --git a/scripts/integration.sh b/scripts/integration.sh index 8e98b15..46ffbdb 100755 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -12,9 +12,6 @@ source "${PROGDIR}/.util/tools.sh" # shellcheck source=SCRIPTDIR/.util/print.sh source "${PROGDIR}/.util/print.sh" -# shellcheck source=SCRIPTDIR/.util/git.sh -source "${PROGDIR}/.util/git.sh" - # shellcheck source=SCRIPTDIR/.util/builders.sh source "${PROGDIR}/.util/builders.sh" From 8ffe7daa7cea277d6feb501c5eb68ee162e8bff2 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Tue, 14 Nov 2023 13:31:16 +0000 Subject: [PATCH 4/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index 46bdfc0..7dc13f1 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { "createpackage": "v1.67.2", - "jam": "v2.6.0", + "jam": "v2.7.0", "pack": "v0.32.0" } From aa4d17555de826007207e6f65be58f64f4db4fc9 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 16 Nov 2023 13:36:01 +0000 Subject: [PATCH 5/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index 7dc13f1..082d016 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { "createpackage": "v1.67.2", "jam": "v2.7.0", - "pack": "v0.32.0" + "pack": "v0.32.1" } From d8965cc32f1fba5ec6fafc888bac37c4bbb7df5a Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Tue, 21 Nov 2023 13:31:54 +0000 Subject: [PATCH 6/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index 082d016..c9ad9c5 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { - "createpackage": "v1.67.2", + "createpackage": "v1.68.0", "jam": "v2.7.0", "pack": "v0.32.1" } From e3e64ee553d79f7c0f84e9a3197a16c1bf0a0463 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Sat, 20 Jan 2024 13:31:03 +0000 Subject: [PATCH 7/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index c9ad9c5..d0bb37a 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { - "createpackage": "v1.68.0", + "createpackage": "v1.68.1", "jam": "v2.7.0", "pack": "v0.32.1" } From c40062dafa8fd47a2ec6c9df90938ef6e7c33dfe Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Wed, 7 Feb 2024 13:30:38 +0000 Subject: [PATCH 8/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index d0bb37a..f6d36ce 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { "createpackage": "v1.68.1", "jam": "v2.7.0", - "pack": "v0.32.1" + "pack": "v0.33.0" } From 95973cc95f954763b5e1761a460fc5e6b8ae719c Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 8 Feb 2024 13:30:40 +0000 Subject: [PATCH 9/9] Updating github-config --- scripts/.util/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index f6d36ce..27bf5a5 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,5 +1,5 @@ { "createpackage": "v1.68.1", "jam": "v2.7.0", - "pack": "v0.33.0" + "pack": "v0.33.1" }