Skip to content

Commit af72228

Browse files
Merge pull request #453 from paketo-buildpacks/update/pipeline
Bump pipeline from 1.36.6 to 1.37.2
2 parents eea9522 + ded7d0f commit af72228

File tree

4 files changed

+53
-20
lines changed

4 files changed

+53
-20
lines changed

.github/pipeline-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.36.6
1+
1.37.2

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

+25-10
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,20 @@ jobs:
3737
with:
3838
crane-version: 0.19.0
3939
yj-version: 5.1.0
40-
- uses: buildpacks/github-actions/[email protected]
41-
with:
42-
pack-version: 0.33.2
40+
- name: Install pack
41+
run: |
42+
#!/usr/bin/env bash
43+
# this is coming from a copy of https://github.com/buildpacks/pack/actions/runs/8118576298 stored on box
44+
# TODO to revisit when the official one is out
45+
set -euo pipefail
46+
47+
echo "Installing pack experimental"
48+
49+
mkdir -p "${HOME}"/bin
50+
echo "${HOME}/bin" >> "${GITHUB_PATH}"
51+
52+
curl -L "https://ent.box.com/shared/static/j4d1bfe9uk1sb0i7zjvci0md9xmy41u4" -o ${HOME}/bin/pack
53+
chmod +x "${HOME}"/bin/pack
4354
- name: Enable pack Experimental
4455
if: ${{ false }}
4556
run: |
@@ -133,15 +144,20 @@ jobs:
133144
134145
set -euo pipefail
135146
147+
CONFIG="--config "${HOME}"/package.toml"
148+
#TODO with this, we don't need to use the package.toml, because pack exp. does not support it with multi arch yet
149+
if ! [ -f "${PWD}/package.toml" ]; then
150+
cd ~/buildpack
151+
CONFIG=""
152+
fi
136153
137154
PACKAGE_LIST=($PACKAGES)
138155
# Extract first repo (Docker Hub) as the main to package & register
139156
PACKAGE=${PACKAGE_LIST[0]}
140157
141158
if [[ "${PUBLISH:-x}" == "true" ]]; then
142-
pack buildpack package \
143-
"${PACKAGE}:${VERSION}" \
144-
--config "${HOME}"/package.toml \
159+
pack -v buildpack package \
160+
"${PACKAGE}:${VERSION}" ${CONFIG} \
145161
--publish
146162
147163
if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
@@ -165,9 +181,8 @@ jobs:
165181
done
166182
167183
else
168-
pack buildpack package \
169-
"${PACKAGE}:${VERSION}" \
170-
--config "${HOME}"/package.toml \
184+
pack -v buildpack package \
185+
"${PACKAGE}:${VERSION}" ${CONFIG} \
171186
--format "${FORMAT}"
172187
fi
173188
env:
@@ -199,7 +214,7 @@ jobs:
199214
DIGEST: ${{ steps.package.outputs.digest }}
200215
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
201216
- if: ${{ true }}
202-
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:4.0.1
217+
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.5.3
203218
with:
204219
address: docker.io/paketobuildpacks/spring-boot@${{ steps.package.outputs.digest }}
205220
id: paketo-buildpacks/spring-boot

.github/workflows/pb-tests.yml

+24-9
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,20 @@ jobs:
2525
set -euo pipefail
2626
2727
go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
28-
- uses: buildpacks/github-actions/[email protected]
29-
with:
30-
pack-version: 0.33.2
28+
- name: Install pack
29+
run: |
30+
#!/usr/bin/env bash
31+
# this is coming from a copy of https://github.com/buildpacks/pack/actions/runs/8118576298 stored on box
32+
# TODO to revisit when the official one is out
33+
set -euo pipefail
34+
35+
echo "Installing pack experimental"
36+
37+
mkdir -p "${HOME}"/bin
38+
echo "${HOME}/bin" >> "${GITHUB_PATH}"
39+
40+
curl -L "https://ent.box.com/shared/static/j4d1bfe9uk1sb0i7zjvci0md9xmy41u4" -o ${HOME}/bin/pack
41+
chmod +x "${HOME}"/bin/pack
3142
- name: Enable pack Experimental
3243
if: ${{ false }}
3344
run: |
@@ -118,15 +129,20 @@ jobs:
118129
119130
set -euo pipefail
120131
132+
CONFIG="--config "${HOME}"/package.toml"
133+
#TODO with this, we don't need to use the package.toml, because pack exp. does not support it with multi arch yet
134+
if ! [ -f "${PWD}/package.toml" ]; then
135+
cd ~/buildpack
136+
CONFIG=""
137+
fi
121138
122139
PACKAGE_LIST=($PACKAGES)
123140
# Extract first repo (Docker Hub) as the main to package & register
124141
PACKAGE=${PACKAGE_LIST[0]}
125142
126143
if [[ "${PUBLISH:-x}" == "true" ]]; then
127-
pack buildpack package \
128-
"${PACKAGE}:${VERSION}" \
129-
--config "${HOME}"/package.toml \
144+
pack -v buildpack package \
145+
"${PACKAGE}:${VERSION}" ${CONFIG} \
130146
--publish
131147
132148
if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
@@ -150,9 +166,8 @@ jobs:
150166
done
151167
152168
else
153-
pack buildpack package \
154-
"${PACKAGE}:${VERSION}" \
155-
--config "${HOME}"/package.toml \
169+
pack -v buildpack package \
170+
"${PACKAGE}:${VERSION}" ${CONFIG} \
156171
--format "${FORMAT}"
157172
fi
158173
env:

.github/workflows/pb-update-pipeline.yml

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555
)
5656
5757
git add .github/
58+
git add .gitignore
59+
git add scripts/build.sh
60+
5861
git checkout -- .
5962
6063
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"

0 commit comments

Comments
 (0)