Skip to content

Commit 371dd49

Browse files
Naveen-is-hereNaveen-is-here
authored
Bump pipeline from 1.34.0 to 1.41.2
Bumps pipeline from 1.34.0 to 1.41.2. Signed-off-by: GitHub <[email protected]>
1 parent c4a9765 commit 371dd49

File tree

10 files changed

+133
-160
lines changed

10 files changed

+133
-160
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @initializ-buildpacks/utilities-maintainers
1+
* @paketo-buildpacks/utilities-maintainers

‎.github/pipeline-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.34.0
1+
1.41.2

‎.github/workflows/pb-create-package.yml‎

Lines changed: 49 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,61 +9,37 @@ jobs:
99
runs-on:
1010
- ubuntu-latest
1111
steps:
12+
- name: Docker login gcr.io
13+
if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
14+
uses: docker/login-action@v3
15+
with:
16+
password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
17+
registry: gcr.io
18+
username: _json_key
1219
- name: Docker login docker.io
1320
if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
14-
uses: docker/login-action@v2
21+
uses: docker/login-action@v3
1522
with:
16-
password: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_PASSWORD }}
23+
password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
1724
registry: docker.io
18-
username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }}
19-
- uses: actions/setup-go@v4
25+
username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
26+
- uses: actions/setup-go@v5
2027
with:
21-
go-version: "stable"
28+
go-version: "1.23"
2229
- name: Install create-package
2330
run: |
2431
#!/usr/bin/env bash
2532
2633
set -euo pipefail
2734
2835
go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
29-
- name: Install crane
30-
run: |
31-
#!/usr/bin/env bash
32-
33-
set -euo pipefail
34-
35-
echo "Installing crane ${CRANE_VERSION}"
36-
37-
mkdir -p "${HOME}"/bin
38-
echo "${HOME}/bin" >> "${GITHUB_PATH}"
39-
40-
curl \
41-
--show-error \
42-
--silent \
43-
--location \
44-
"https://github.com/google/go-containerregistry/releases/download/v${CRANE_VERSION}/go-containerregistry_Linux_x86_64.tar.gz" \
45-
| tar -C "${HOME}/bin" -xz crane
46-
env:
47-
CRANE_VERSION: 0.8.0
48-
- name: Install pack
49-
run: |
50-
#!/usr/bin/env bash
51-
52-
set -euo pipefail
53-
54-
echo "Installing pack ${PACK_VERSION}"
55-
56-
mkdir -p "${HOME}"/bin
57-
echo "${HOME}/bin" >> "${GITHUB_PATH}"
58-
59-
curl \
60-
--location \
61-
--show-error \
62-
--silent \
63-
"https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \
64-
| tar -C "${HOME}"/bin -xz pack
65-
env:
66-
PACK_VERSION: 0.36.0
36+
- uses: buildpacks/github-actions/[email protected]
37+
with:
38+
crane-version: 0.19.1
39+
yj-version: 5.1.0
40+
- uses: buildpacks/github-actions/[email protected]
41+
with:
42+
pack-version: 0.34.2
6743
- name: Enable pack Experimental
6844
if: ${{ false }}
6945
run: |
@@ -75,9 +51,9 @@ jobs:
7551
7652
mkdir -p "${HOME}"/.pack
7753
echo "experimental = true" >> "${HOME}"/.pack/config.toml
78-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
7955
- if: ${{ false }}
80-
uses: actions/cache@v3
56+
uses: actions/cache@v4
8157
with:
8258
key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }}
8359
path: |-
@@ -91,8 +67,8 @@ jobs:
9167
9268
set -euo pipefail
9369
94-
if [ -z "${GITHUB_REF+set}" ]; then
95-
echo "GITHUB_REF set to [${GITHUB_REF-<unset>}], but should never be empty or unset"
70+
if [[ ${GITHUB_REF:-} != "refs/"* ]]; then
71+
echo "GITHUB_REF set to [${GITHUB_REF:-}], but that is unexpected. It should start with 'refs/*'"
9672
exit 255
9773
fi
9874
@@ -130,21 +106,23 @@ jobs:
130106
131107
if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then
132108
create-package \
133-
--source ${SOURCE_PATH:-.} \
109+
--source "${SOURCE_PATH:-.}" \
134110
--cache-location "${HOME}"/carton-cache \
135111
--destination "${HOME}"/buildpack \
136112
--include-dependencies \
137113
--version "${VERSION}"
138114
else
139115
create-package \
140-
--source ${SOURCE_PATH:-.} \
116+
--source "${SOURCE_PATH:-.}" \
141117
--destination "${HOME}"/buildpack \
142118
--version "${VERSION}"
143119
fi
144120
145-
PACKAGE_FILE=${SOURCE_PATH:-.}/package.toml
146-
[[ -e ${PACKAGE_FILE} ]] && cp ${PACKAGE_FILE} "${HOME}"/package.toml
147-
printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}"/buildpack "${OS}" >> "${HOME}"/package.toml
121+
PACKAGE_FILE="${SOURCE_PATH:-.}/package.toml"
122+
if [ -f "${PACKAGE_FILE}" ]; then
123+
cp "${PACKAGE_FILE}" "${HOME}/buildpack/package.toml"
124+
printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}/buildpack" "${OS}" >> "${HOME}/buildpack/package.toml"
125+
fi
148126
env:
149127
INCLUDE_DEPENDENCIES: "false"
150128
OS: linux
@@ -157,15 +135,23 @@ jobs:
157135
158136
set -euo pipefail
159137
138+
COMPILED_BUILDPACK="${HOME}/buildpack"
139+
140+
# create-package puts the buildpack here, we need to run from that directory
141+
# for component buildpacks so that pack doesn't need a package.toml
142+
cd "${COMPILED_BUILDPACK}"
143+
CONFIG=""
144+
if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then
145+
CONFIG="--config ${COMPILED_BUILDPACK}/package.toml"
146+
fi
160147
161148
PACKAGE_LIST=($PACKAGES)
162149
# Extract first repo (Docker Hub) as the main to package & register
163150
PACKAGE=${PACKAGE_LIST[0]}
164151
165152
if [[ "${PUBLISH:-x}" == "true" ]]; then
166-
pack buildpack package \
167-
"${PACKAGE}:${VERSION}" \
168-
--config "${HOME}"/package.toml \
153+
pack -v buildpack package \
154+
"${PACKAGE}:${VERSION}" ${CONFIG} \
169155
--publish
170156
171157
if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
@@ -189,13 +175,12 @@ jobs:
189175
done
190176
191177
else
192-
pack buildpack package \
193-
"${PACKAGE}:${VERSION}" \
194-
--config "${HOME}"/package.toml \
195-
--format "${FORMAT}"
178+
pack -v buildpack package \
179+
"${PACKAGE}:${VERSION}" ${CONFIG} \
180+
--format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
196181
fi
197182
env:
198-
PACKAGES: docker.io/initializbuildpacks/watchexec docker.io/initializbuildpacks/watchexec
183+
PACKAGES: docker.io/paketobuildpacks/watchexec gcr.io/paketo-buildpacks/watchexec
199184
PUBLISH: "true"
200185
VERSION: ${{ steps.version.outputs.version }}
201186
VERSION_MAJOR: ${{ steps.version.outputs.version-major }}
@@ -221,11 +206,11 @@ jobs:
221206
--field "body=${RELEASE_BODY//<!-- DIGEST PLACEHOLDER -->/\`${DIGEST}\`}"
222207
env:
223208
DIGEST: ${{ steps.package.outputs.digest }}
224-
GITHUB_TOKEN: ${{ secrets.PAT }}
209+
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
225210
- if: ${{ true }}
226-
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:4.0.1
211+
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.7.2
227212
with:
228-
address: docker.io/initializbuildpacks/watchexec@${{ steps.package.outputs.digest }}
213+
address: docker.io/paketobuildpacks/watchexec@${{ steps.package.outputs.digest }}
229214
id: initializ-buildpacks/watchexec
230-
token: ${{ secrets.PAT }}
215+
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
231216
version: ${{ steps.version.outputs.version }}

‎.github/workflows/pb-minimal-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on:
1313
- ubuntu-latest
1414
steps:
15-
- uses: mheap/github-action-required-labels@v4
15+
- uses: mheap/github-action-required-labels@v5
1616
with:
1717
count: 1
1818
labels: semver:major, semver:minor, semver:patch
@@ -22,7 +22,7 @@ jobs:
2222
runs-on:
2323
- ubuntu-latest
2424
steps:
25-
- uses: mheap/github-action-required-labels@v4
25+
- uses: mheap/github-action-required-labels@v5
2626
with:
2727
count: 1
2828
labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task

‎.github/workflows/pb-synchronize-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on:
1212
- ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: micnncim/action-label-syncer@v1
1616
env:
17-
GITHUB_TOKEN: ${{ secrets.PAT }}
17+
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}

‎.github/workflows/pb-tests.yml‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,19 @@ jobs:
1515
runs-on:
1616
- ubuntu-latest
1717
steps:
18-
- uses: actions/setup-go@v4
18+
- uses: actions/setup-go@v5
1919
with:
20-
go-version: "stable"
20+
go-version: "1.23"
2121
- name: Install create-package
2222
run: |
2323
#!/usr/bin/env bash
2424
2525
set -euo pipefail
2626
2727
go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
28-
- name: Install pack
29-
run: |
30-
#!/usr/bin/env bash
31-
32-
set -euo pipefail
33-
34-
echo "Installing pack ${PACK_VERSION}"
35-
36-
mkdir -p "${HOME}"/bin
37-
echo "${HOME}/bin" >> "${GITHUB_PATH}"
38-
39-
curl \
40-
--location \
41-
--show-error \
42-
--silent \
43-
"https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \
44-
| tar -C "${HOME}"/bin -xz pack
45-
env:
46-
PACK_VERSION: 0.34.2
28+
- uses: buildpacks/github-actions/[email protected]
29+
with:
30+
pack-version: 0.34.2
4731
- name: Enable pack Experimental
4832
if: ${{ false }}
4933
run: |
@@ -55,8 +39,8 @@ jobs:
5539
5640
mkdir -p "${HOME}"/.pack
5741
echo "experimental = true" >> "${HOME}"/.pack/config.toml
58-
- uses: actions/checkout@v3
59-
- uses: actions/cache@v3
42+
- uses: actions/checkout@v4
43+
- uses: actions/cache@v4
6044
with:
6145
key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }}
6246
path: |-
@@ -70,8 +54,8 @@ jobs:
7054
7155
set -euo pipefail
7256
73-
if [ -z "${GITHUB_REF+set}" ]; then
74-
echo "GITHUB_REF set to [${GITHUB_REF-<unset>}], but should never be empty or unset"
57+
if [[ ${GITHUB_REF:-} != "refs/"* ]]; then
58+
echo "GITHUB_REF set to [${GITHUB_REF:-}], but that is unexpected. It should start with 'refs/*'"
7559
exit 255
7660
fi
7761
@@ -109,21 +93,23 @@ jobs:
10993
11094
if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then
11195
create-package \
112-
--source ${SOURCE_PATH:-.} \
96+
--source "${SOURCE_PATH:-.}" \
11397
--cache-location "${HOME}"/carton-cache \
11498
--destination "${HOME}"/buildpack \
11599
--include-dependencies \
116100
--version "${VERSION}"
117101
else
118102
create-package \
119-
--source ${SOURCE_PATH:-.} \
103+
--source "${SOURCE_PATH:-.}" \
120104
--destination "${HOME}"/buildpack \
121105
--version "${VERSION}"
122106
fi
123107
124-
PACKAGE_FILE=${SOURCE_PATH:-.}/package.toml
125-
[[ -e ${PACKAGE_FILE} ]] && cp ${PACKAGE_FILE} "${HOME}"/package.toml
126-
printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}"/buildpack "${OS}" >> "${HOME}"/package.toml
108+
PACKAGE_FILE="${SOURCE_PATH:-.}/package.toml"
109+
if [ -f "${PACKAGE_FILE}" ]; then
110+
cp "${PACKAGE_FILE}" "${HOME}/buildpack/package.toml"
111+
printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}/buildpack" "${OS}" >> "${HOME}/buildpack/package.toml"
112+
fi
127113
env:
128114
INCLUDE_DEPENDENCIES: "true"
129115
OS: linux
@@ -134,15 +120,23 @@ jobs:
134120
135121
set -euo pipefail
136122
123+
COMPILED_BUILDPACK="${HOME}/buildpack"
124+
125+
# create-package puts the buildpack here, we need to run from that directory
126+
# for component buildpacks so that pack doesn't need a package.toml
127+
cd "${COMPILED_BUILDPACK}"
128+
CONFIG=""
129+
if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then
130+
CONFIG="--config ${COMPILED_BUILDPACK}/package.toml"
131+
fi
137132
138133
PACKAGE_LIST=($PACKAGES)
139134
# Extract first repo (Docker Hub) as the main to package & register
140135
PACKAGE=${PACKAGE_LIST[0]}
141136
142137
if [[ "${PUBLISH:-x}" == "true" ]]; then
143-
pack buildpack package \
144-
"${PACKAGE}:${VERSION}" \
145-
--config "${HOME}"/package.toml \
138+
pack -v buildpack package \
139+
"${PACKAGE}:${VERSION}" ${CONFIG} \
146140
--publish
147141
148142
if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
@@ -166,29 +160,29 @@ jobs:
166160
done
167161
168162
else
169-
pack buildpack package \
170-
"${PACKAGE}:${VERSION}" \
171-
--config "${HOME}"/package.toml \
172-
--format "${FORMAT}"
163+
pack -v buildpack package \
164+
"${PACKAGE}:${VERSION}" ${CONFIG} \
165+
--format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
173166
fi
174167
env:
175168
FORMAT: image
176169
PACKAGES: test
170+
TTL_SH_PUBLISH: "false"
177171
VERSION: ${{ steps.version.outputs.version }}
178172
unit:
179173
name: Unit Test
180174
runs-on:
181175
- ubuntu-latest
182176
steps:
183-
- uses: actions/checkout@v3
184-
- uses: actions/cache@v3
177+
- uses: actions/checkout@v4
178+
- uses: actions/cache@v4
185179
with:
186180
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
187181
path: ${{ env.HOME }}/go/pkg/mod
188182
restore-keys: ${{ runner.os }}-go-
189-
- uses: actions/setup-go@v4
183+
- uses: actions/setup-go@v5
190184
with:
191-
go-version: "stable"
185+
go-version: "1.23"
192186
- name: Install richgo
193187
run: |
194188
#!/usr/bin/env bash

0 commit comments

Comments
 (0)