Skip to content

Commit 138c4d0

Browse files
committed
Updating github-config
1 parent c1c6a35 commit 138c4d0

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

.github/workflows/create-release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
release_notes: ${{ steps.notes.outputs.body }}
1616
steps:
1717
- name: Setup Go
18-
uses: actions/setup-go@v3
18+
uses: actions/setup-go@v5
1919
with:
2020
go-version: 'stable'
2121

@@ -61,20 +61,17 @@ jobs:
6161
- name: Compare With Previous Release
6262
id: compare_previous_release
6363
run: |
64-
if git show-ref --tags > /dev/null; then
65-
if [ -z "$(git diff "$(git describe --tags --abbrev=0 2>/dev/null)" -- builder-buildpackless.toml)" ]; then
66-
echo "builder_changes=false" >> "$GITHUB_OUTPUT"
67-
else
68-
echo "builder_changes=true" >> "$GITHUB_OUTPUT"
69-
fi
64+
if [ -z "$(git diff $(git describe --tags --abbrev=0) -- builder.toml)" ]
65+
then
66+
echo "builder_changes=false" >> "$GITHUB_OUTPUT"
7067
else
7168
echo "builder_changes=true" >> "$GITHUB_OUTPUT"
7269
fi
7370
7471
- name: Publish Release
7572
id: publish
7673
if: ${{ steps.compare_previous_release.outputs.builder_changes == 'true' }}
77-
uses: release-drafter/release-drafter@v5
74+
uses: release-drafter/release-drafter@v6
7875
with:
7976
config-name: release-drafter-config.yml
8077
publish: true

.github/workflows/lint-yaml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
path: github-config
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: 3.8
2525

.github/workflows/push-image.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
echo "tag=$(jq -r '.release.tag_name' "${GITHUB_EVENT_PATH}" | sed s/^v//)" >> "$GITHUB_OUTPUT"
1818
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Get pack version
2323
id: pack-version
@@ -36,20 +36,27 @@ jobs:
3636
pack config experimental true
3737
fi
3838
39-
- name: Create Builder Image and Push To Dockerhub
39+
- name: Create Builder Image
40+
run: |
41+
pack builder create builder --config builder.toml
42+
43+
- name: Push To Dockerhub
4044
env:
4145
PAKETO_BUILDPACKS_DOCKERHUB_USERNAME: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
4246
PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
4347
GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
4448
run: |
4549
DOCKERHUB_ORG="${GITHUB_REPOSITORY_OWNER/-/}" # translates 'paketo-buildpacks' to 'paketobuildpacks'
46-
registry_repo=ubi-9-buildpackless-builder
50+
# Strip off the Github org prefix from repo name
51+
# paketo-buildpacks/builder-with-some-name --> builder-with-some-name
52+
registry_repo=$(echo "${{ github.repository }}" | sed 's/^.*\///')
4753
4854
echo "${PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD}" | docker login --username "${PAKETO_BUILDPACKS_DOCKERHUB_USERNAME}" --password-stdin
49-
# In order to publish multi-arch builders with pack, the builder MUST be published.
50-
# It cannot be created locally and then pushed
51-
pack builder create "${DOCKERHUB_ORG}/${registry_repo}:${{ steps.event.outputs.tag }}" --config builder-buildpackless.toml --publish
52-
pack builder create "${DOCKERHUB_ORG}/${registry_repo}:latest" --config builder-buildpackless.toml --publish
55+
docker tag builder "${DOCKERHUB_ORG}/${registry_repo}:latest"
56+
docker tag builder "${DOCKERHUB_ORG}/${registry_repo}:${{ steps.event.outputs.tag }}"
57+
58+
docker push "${DOCKERHUB_ORG}/${registry_repo}:latest"
59+
docker push "${DOCKERHUB_ORG}/${registry_repo}:${{ steps.event.outputs.tag }}"
5360
5461
failure:
5562
name: Alert on Failure

.github/workflows/test-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-24.04
1111
steps:
1212
- name: Setup Go
13-
uses: actions/setup-go@v3
13+
uses: actions/setup-go@v5
1414
with:
1515
go-version: 'stable'
1616

.github/workflows/test-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Setup Go
15-
uses: actions/setup-go@v3
15+
uses: actions/setup-go@v5
1616
with:
1717
go-version: 'stable'
1818

.github/workflows/update-builder-toml.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Check out
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Checkout branch
1919
uses: paketo-buildpacks/github-config/actions/pull-request/checkout-branch@main
@@ -24,14 +24,13 @@ jobs:
2424
uses: paketo-buildpacks/github-config/actions/builder/update@main
2525
with:
2626
token: ${{ secrets.GITHUB_TOKEN }}
27-
filename: "builder-buildpackless.toml"
2827

2928
- name: Git commit
3029
id: commit
3130
uses: paketo-buildpacks/github-config/actions/pull-request/create-commit@main
3231
with:
3332
message: "Update builder.toml"
34-
pathspec: "builder-buildpackless.toml"
33+
pathspec: "builder.toml"
3534
keyid: ${{ secrets.PAKETO_BOT_GPG_SIGNING_KEY_ID }}
3635
key: ${{ secrets.PAKETO_BOT_GPG_SIGNING_KEY }}
3736

0 commit comments

Comments
 (0)