Skip to content

Commit 5fbcc9f

Browse files
committed
Updating github-config
1 parent 9878e2b commit 5fbcc9f

14 files changed

Lines changed: 331 additions & 50 deletions

.github/workflows/approve-bot-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Checkout
5454
if: steps.human-commits.outputs.human_commits == 'false' && steps.unverified-commits.outputs.unverified_commits == 'false'
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656

5757
- name: Approve
5858
if: steps.human-commits.outputs.human_commits == 'false' && steps.unverified-commits.outputs.unverified_commits == 'false'

.github/workflows/create-draft-release.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
builders: ${{ steps.builders.outputs.builders }}
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626
- name: Get builders from integration.json
2727
id: builders
2828
run: |
@@ -41,9 +41,9 @@ jobs:
4141
fail-fast: false # don't cancel all test jobs when one fails
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545
- name: Setup Go
46-
uses: actions/setup-go@v5
46+
uses: actions/setup-go@v6
4747
with:
4848
go-version-file: go.mod
4949
- name: Run Integration Tests
@@ -57,7 +57,7 @@ jobs:
5757
needs: integration
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161
with:
6262
fetch-tags: true
6363
- name: Reset Draft Release
@@ -106,6 +106,11 @@ jobs:
106106
"path": "build/buildpackage.cnb",
107107
"name": "${{ github.event.repository.name }}-${{ steps.tag.outputs.tag }}.cnb",
108108
"content_type": "application/x-tar"
109+
},
110+
{
111+
"path": "build/buildpack-release-artifact.tgz",
112+
"name": "${{ github.event.repository.name }}-${{ steps.tag.outputs.tag }}.tgz",
113+
"content_type": "application/gzip"
109114
}
110115
]
111116

.github/workflows/lint-yaml.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
lintYaml:
1111
runs-on: ubuntu-24.04
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Checkout github-config
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
with:
1818
repository: paketo-buildpacks/github-config
1919
path: github-config

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-24.04
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Setup Go
20-
uses: actions/setup-go@v5
20+
uses: actions/setup-go@v6
2121
with:
2222
go-version-file: go.mod
2323

.github/workflows/push-buildpackage.yml

Lines changed: 51 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
- published
77
env:
88
REGISTRIES_FILENAME: "registries.json"
9+
GCR_REGISTRY: "gcr.io"
10+
GCR_PASSWORD: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
11+
GCR_USERNAME: "_json_key"
12+
DOCKERHUB_REGISTRY: docker.io
13+
DOCKERHUB_USERNAME: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
14+
DOCKERHUB_PASSWORD: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
915

1016
jobs:
1117
push:
@@ -14,7 +20,7 @@ jobs:
1420
steps:
1521

1622
- name: Checkout
17-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
1824

1925
- name: Parse Event
2026
id: event
@@ -25,14 +31,13 @@ jobs:
2531
echo "tag_full=${FULL_VERSION}" >> "$GITHUB_OUTPUT"
2632
echo "tag_minor=${MINOR_VERSION}" >> "$GITHUB_OUTPUT"
2733
echo "tag_major=${MAJOR_VERSION}" >> "$GITHUB_OUTPUT"
28-
echo "download_url=$(jq -r '.release.assets[] | select(.name | endswith(".cnb")) | .url' "${GITHUB_EVENT_PATH}")" >> "$GITHUB_OUTPUT"
34+
echo "download_tgz_file_url=$(jq -r '.release.assets[] | select(.name | endswith(".tgz")) | .url' "${GITHUB_EVENT_PATH}")" >> "$GITHUB_OUTPUT"
2935
30-
- name: Download
31-
id: download
36+
- name: Download .tgz buildpack release artifact
3237
uses: paketo-buildpacks/github-config/actions/release/download-asset@main
3338
with:
34-
url: ${{ steps.event.outputs.download_url }}
35-
output: "/github/workspace/buildpackage.cnb"
39+
url: ${{ steps.event.outputs.download_tgz_file_url }}
40+
output: "/github/workspace/buildpack-release-artifact.tgz"
3641
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
3742

3843
- name: Parse Configs
@@ -55,50 +60,69 @@ jobs:
5560
echo "push_to_dockerhub=${push_to_dockerhub}" >> "$GITHUB_OUTPUT"
5661
echo "push_to_gcr=${push_to_gcr}" >> "$GITHUB_OUTPUT"
5762
63+
- name: Install yj and crane
64+
uses: buildpacks/github-actions/[email protected]
65+
5866
- name: Validate version
5967
run: |
60-
buidpackTomlVersion=$(sudo skopeo inspect "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" | jq -r '.Labels."io.buildpacks.buildpackage.metadata" | fromjson | .version')
68+
buidpackTomlVersion=$(tar -xzf buildpack-release-artifact.tgz --to-stdout buildpack.toml | yj -tj | jq -r .buildpack.version)
6169
githubReleaseVersion="${{ steps.event.outputs.tag_full }}"
6270
if [[ "$buidpackTomlVersion" != "$githubReleaseVersion" ]]; then
6371
echo "Version in buildpack.toml ($buidpackTomlVersion) and github release ($githubReleaseVersion) are not identical"
6472
exit 1
6573
fi
6674
75+
- name: Docker login docker.io
76+
uses: docker/login-action@v3
77+
with:
78+
username: ${{ env.DOCKERHUB_USERNAME }}
79+
password: ${{ env.DOCKERHUB_PASSWORD }}
80+
registry: ${{ env.DOCKERHUB_REGISTRY }}
81+
82+
- name: Docker login gcr.io
83+
uses: docker/login-action@v3
84+
if: ${{ steps.parse_configs.outputs.push_to_gcr == 'true' }}
85+
with:
86+
username: ${{ env.GCR_USERNAME }}
87+
password: ${{ env.GCR_PASSWORD }}
88+
registry: ${{ env.GCR_REGISTRY }}
89+
6790
- name: Push to GCR
6891
if: ${{ steps.parse_configs.outputs.push_to_gcr == 'true' }}
69-
env:
70-
GCR_PUSH_BOT_JSON_KEY: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
7192
run: |
72-
echo "${GCR_PUSH_BOT_JSON_KEY}" | sudo skopeo login --username _json_key --password-stdin gcr.io
73-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_full }}"
74-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_minor }}"
75-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_major }}"
76-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://gcr.io/${{ github.repository }}:latest"
93+
./scripts/publish.sh \
94+
--archive-path buildpack-release-artifact.tgz \
95+
--image-ref "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_full }}"
96+
97+
crane copy "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_full }}" "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_minor }}"
98+
crane copy "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_full }}" "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_major }}"
99+
crane copy "gcr.io/${{ github.repository }}:${{ steps.event.outputs.tag_full }}" "gcr.io/${{ github.repository }}:latest"
77100
78101
- name: Push to DockerHub
79102
if: ${{ steps.parse_configs.outputs.push_to_dockerhub == 'true' }}
80103
id: push
81-
env:
82-
DOCKERHUB_USERNAME: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
83-
DOCKERHUB_PASSWORD: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
84-
GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
85104
run: |
86-
REPOSITORY="${GITHUB_REPOSITORY_OWNER/-/}/${GITHUB_REPOSITORY#${GITHUB_REPOSITORY_OWNER}/}" # translates 'paketo-buildpacks/bundle-install' to 'paketobuildpacks/bundle-install'
87-
IMAGE="index.docker.io/${REPOSITORY}"
88-
echo "${DOCKERHUB_PASSWORD}" | sudo skopeo login --username "${DOCKERHUB_USERNAME}" --password-stdin index.docker.io
89-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://${IMAGE}:${{ steps.event.outputs.tag_full }}"
90-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://${IMAGE}:${{ steps.event.outputs.tag_minor }}"
91-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://${IMAGE}:${{ steps.event.outputs.tag_major }}"
92-
sudo skopeo copy "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" "docker://${IMAGE}:latest"
105+
IMAGE="${GITHUB_REPOSITORY_OWNER/-/}/${GITHUB_REPOSITORY#${GITHUB_REPOSITORY_OWNER}/}" # translates 'paketo-buildpacks/bundle-install' to 'paketobuildpacks/bundle-install'
106+
107+
./scripts/publish.sh \
108+
--archive-path buildpack-release-artifact.tgz \
109+
--image-ref "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_full }}"
110+
111+
pushed_image_index_digest=$(crane digest "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_full }}" | xargs)
112+
113+
crane copy "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_full }}" "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_minor }}"
114+
crane copy "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_full }}" "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_major }}"
115+
crane copy "${DOCKERHUB_REGISTRY}/${IMAGE}:${{ steps.event.outputs.tag_full }}" "${DOCKERHUB_REGISTRY}/${IMAGE}:latest"
116+
93117
echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
94-
echo "digest=$(sudo skopeo inspect "oci-archive:${GITHUB_WORKSPACE}/buildpackage.cnb" | jq -r .Digest)" >> "$GITHUB_OUTPUT"
118+
echo "digest=$pushed_image_index_digest" >> "$GITHUB_OUTPUT"
95119
96120
- name: Register with CNB Registry
97121
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:main
98122
with:
99123
id: ${{ github.repository }}
100124
version: ${{ steps.event.outputs.tag_full }}
101-
address: ${{ steps.push.outputs.image }}@${{ steps.push.outputs.digest }}
125+
address: index.docker.io/${{ steps.push.outputs.image }}@${{ steps.push.outputs.digest }}
102126
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
103127

104128
failure:

.github/workflows/synchronize-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on:
1313
- ubuntu-24.04
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: micnncim/action-label-syncer@v1
1717
env:
1818
GITHUB_TOKEN: ${{ github.token }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
builders: ${{ steps.builders.outputs.builders }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
- name: Get builders from integration.json
2323
id: builders
2424
run: |
@@ -38,10 +38,10 @@ jobs:
3838
fail-fast: false # don't cancel all test jobs when one fails
3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
- name: Setup Go
44-
uses: actions/setup-go@v5
44+
uses: actions/setup-go@v6
4545
with:
4646
go-version-file: go.mod
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515

1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Checkout Branch
2020
uses: paketo-buildpacks/github-config/actions/pull-request/checkout-branch@main

.github/workflows/update-github-config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
steps:
1515

1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
2020

2121
- name: Checkout github-config
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
repository: paketo-buildpacks/github-config
2525
path: github-config

.github/workflows/update-go-mod-version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
- name: Checkout PR Branch
1818
uses: paketo-buildpacks/github-config/actions/pull-request/checkout-branch@main
1919
with:
2020
branch: automation/go-mod-update/update-main
2121
- name: Setup Go
2222
id: setup-go
23-
uses: actions/setup-go@v5
23+
uses: actions/setup-go@v6
2424
with:
2525
go-version-file: go.mod
2626
- name: Get current go toolchain version

0 commit comments

Comments
 (0)