Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pipeline-descriptor.yml #253

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Update pipeline-descriptor.yml #253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd0031
Update `pipeline-descriptor.yml`
dmikusa Jan 31, 2023
ea4ee6f
Update .github/pipeline-descriptor.yml
dmikusa Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @paketo-buildpacks/java-buildpacks
* @paketo-buildpacks/java-maintainers
25 changes: 14 additions & 11 deletions .github/pipeline-descriptor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
github:
username: ${{ secrets.JAVA_GITHUB_USERNAME }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}

codeowners:
- path: "*"
owner: "@paketo-buildpacks/java-buildpacks"
owner: "@paketo-buildpacks/java-maintainers"

package:
repository: gcr.io/paketo-buildpacks/sap-machine
repositories: ["docker.io/paketobuildpacks/sap-machine","gcr.io/paketo-buildpacks/sap-machine"]
register: true
registry_token: ${{ secrets.JAVA_GITHUB_TOKEN }}
registry_token: ${ secrets.PAKETO_BOT_GITHUB_TOKEN }
dmikusa marked this conversation as resolved.
Show resolved Hide resolved

docker_credentials:
- registry: gcr.io
username: _json_key
password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
- registry: docker.io
username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}

dependencies:
- name: JDK 11
Expand All @@ -27,7 +30,7 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(11.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JRE 11
id: jre
version_pattern: "11\\.[\\d]+\\.[\\d]+"
Expand All @@ -38,7 +41,7 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(11.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JDK 17
id: jdk
version_pattern: "17\\.[\\d]+\\.[\\d]+"
Expand All @@ -49,7 +52,7 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(17.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JRE 17
id: jre
version_pattern: "17\\.[\\d]+\\.[\\d]+"
Expand All @@ -60,7 +63,7 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(17.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JDK 19
id: jdk
version_pattern: "19\\.[\\d]+\\.[\\d]+"
Expand All @@ -71,7 +74,7 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(19.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: JRE 19
id: jre
version_pattern: "19\\.[\\d]+\\.[\\d]+"
Expand All @@ -82,4 +85,4 @@ dependencies:
repository: SapMachine
tag_filter: sapmachine-(19.*)
latest_by_creation_time: true
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
25 changes: 16 additions & 9 deletions .github/workflows/pb-create-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@ jobs:
if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
uses: docker/login-action@v2
with:
password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
registry: gcr.io
username: _json_key
- name: Docker login docker.io
if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
uses: docker/login-action@v2
with:
password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
registry: docker.io
username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
- uses: actions/setup-go@v3
with:
go-version: "1.18"
Expand Down Expand Up @@ -102,15 +109,15 @@ jobs:
MAJOR_VERSION="$(echo "${VERSION}" | awk -F '.' '{print $1 }')"
MINOR_VERSION="$(echo "${VERSION}" | awk -F '.' '{print $1 "." $2 }')"

echo "::set-output name=version-major::${MAJOR_VERSION}"
echo "::set-output name=version-minor::${MINOR_VERSION}"
echo "version-major=${MAJOR_VERSION}" >> "$GITHUB_OUTPUT"
echo "version-minor=${MINOR_VERSION}" >> "$GITHUB_OUTPUT"
elif [[ ${GITHUB_REF} =~ refs/heads/(.+) ]]; then
VERSION=${BASH_REMATCH[1]}
else
VERSION=$(git rev-parse --short HEAD)
fi

echo "::set-output name=version::${VERSION}"
echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "Selected ${VERSION} from
* ref: ${GITHUB_REF}
* sha: ${GITHUB_SHA}
Expand Down Expand Up @@ -166,7 +173,7 @@ jobs:
crane tag "${PACKAGE}:${VERSION}" "${VERSION_MAJOR}"
fi
crane tag "${PACKAGE}:${VERSION}" latest
echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
echo "digest=$(crane digest "${PACKAGE}:${VERSION}")" >> "$GITHUB_OUTPUT"

# copy to other repositories specified
for P in "${PACKAGE_LIST[@]}"
Expand All @@ -188,7 +195,7 @@ jobs:
--format "${FORMAT}"
fi
env:
PACKAGES: gcr.io/paketo-buildpacks/sap-machine
PACKAGES: docker.io/paketobuildpacks/sap-machine gcr.io/paketo-buildpacks/sap-machine
PUBLISH: "true"
VERSION: ${{ steps.version.outputs.version }}
VERSION_MAJOR: ${{ steps.version.outputs.version-major }}
Expand All @@ -214,11 +221,11 @@ jobs:
--field "body=${RELEASE_BODY//<!-- DIGEST PLACEHOLDER -->/\`${DIGEST}\`}"
env:
DIGEST: ${{ steps.package.outputs.digest }}
GITHUB_TOKEN: ${{ secrets.JAVA_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- if: ${{ true }}
uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:4.0.1
with:
address: gcr.io/paketo-buildpacks/sap-machine@${{ steps.package.outputs.digest }}
address: docker.io/paketobuildpacks/sap-machine@${{ steps.package.outputs.digest }}
id: paketo-buildpacks/sap-machine
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${ secrets.PAKETO_BOT_GITHUB_TOKEN }
version: ${{ steps.version.outputs.version }}
4 changes: 2 additions & 2 deletions .github/workflows/pb-minimal-labels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on:
- ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v2
- uses: mheap/github-action-required-labels@v3
with:
count: 1
labels: semver:major, semver:minor, semver:patch
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on:
- ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v2
- uses: mheap/github-action-required-labels@v3
with:
count: 1
labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pb-synchronize-labels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- uses: actions/checkout@v3
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ secrets.JAVA_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/pb-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ jobs:
MAJOR_VERSION="$(echo "${VERSION}" | awk -F '.' '{print $1 }')"
MINOR_VERSION="$(echo "${VERSION}" | awk -F '.' '{print $1 "." $2 }')"

echo "::set-output name=version-major::${MAJOR_VERSION}"
echo "::set-output name=version-minor::${MINOR_VERSION}"
echo "version-major=${MAJOR_VERSION}" >> "$GITHUB_OUTPUT"
echo "version-minor=${MINOR_VERSION}" >> "$GITHUB_OUTPUT"
elif [[ ${GITHUB_REF} =~ refs/heads/(.+) ]]; then
VERSION=${BASH_REMATCH[1]}
else
VERSION=$(git rev-parse --short HEAD)
fi

echo "::set-output name=version::${VERSION}"
echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "Selected ${VERSION} from
* ref: ${GITHUB_REF}
* sha: ${GITHUB_SHA}
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
crane tag "${PACKAGE}:${VERSION}" "${VERSION_MAJOR}"
fi
crane tag "${PACKAGE}:${VERSION}" latest
echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
echo "digest=$(crane digest "${PACKAGE}:${VERSION}")" >> "$GITHUB_OUTPUT"

# copy to other repositories specified
for P in "${PACKAGE_LIST[@]}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pb-update-draft-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
- id: release-drafter
uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.JAVA_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- uses: actions/checkout@v3
- name: Update draft release with buildpack information
uses: docker://ghcr.io/paketo-buildpacks/actions/draft-release:main
with:
github_token: ${{ secrets.JAVA_GITHUB_TOKEN }}
github_token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
release_body: ${{ steps.release-drafter.outputs.body }}
release_id: ${{ steps.release-drafter.outputs.id }}
release_name: ${{ steps.release-drafter.outputs.name }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pb-update-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Update Go
"on":
schedule:
- cron: 0 2 * * 1
- cron: 14 2 * * 1
workflow_dispatch: {}
jobs:
update:
Expand Down Expand Up @@ -45,9 +45,9 @@ jobs:
COMMIT_SEMVER="semver:minor"
fi

echo "::set-output name=commit-title::${COMMIT_TITLE}"
echo "::set-output name=commit-body::${COMMIT_BODY}"
echo "::set-output name=commit-semver::${COMMIT_SEMVER}"
echo "commit-title=${COMMIT_TITLE}" >> "$GITHUB_OUTPUT"
echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT"
echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT"
env:
GO_VERSION: "1.18"
- uses: peter-evans/create-pull-request@v4
Expand All @@ -69,4 +69,4 @@ jobs:
labels: ${{ steps.update-go.outputs.commit-semver }}, type:task
signoff: true
title: ${{ steps.update-go.outputs.commit-title }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
12 changes: 6 additions & 6 deletions .github/workflows/pb-update-jdk-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(11.*)
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
run: |-
run: |
#!/usr/bin/env bash

set -euo pipefail
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
LABEL="semver:patch"
fi

echo "::set-output name=old-version::${OLD_VERSION}"
echo "::set-output name=new-version::${VERSION}"
echo "::set-output name=version-label::${LABEL}"
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
env:
CPE: ${{ steps.dependency.outputs.cpe }}
CPE_PATTERN: ""
Expand All @@ -112,4 +112,4 @@ jobs:
labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
signoff: true
title: Bump JDK 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
12 changes: 6 additions & 6 deletions .github/workflows/pb-update-jdk-17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(17.*)
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
run: |-
run: |
#!/usr/bin/env bash

set -euo pipefail
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
LABEL="semver:patch"
fi

echo "::set-output name=old-version::${OLD_VERSION}"
echo "::set-output name=new-version::${VERSION}"
echo "::set-output name=version-label::${LABEL}"
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
env:
CPE: ${{ steps.dependency.outputs.cpe }}
CPE_PATTERN: ""
Expand All @@ -112,4 +112,4 @@ jobs:
labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
signoff: true
title: Bump JDK 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
12 changes: 6 additions & 6 deletions .github/workflows/pb-update-jdk-19.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(19.*)
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
run: |-
run: |
#!/usr/bin/env bash

set -euo pipefail
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
LABEL="semver:patch"
fi

echo "::set-output name=old-version::${OLD_VERSION}"
echo "::set-output name=new-version::${VERSION}"
echo "::set-output name=version-label::${LABEL}"
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
env:
CPE: ${{ steps.dependency.outputs.cpe }}
CPE_PATTERN: ""
Expand All @@ -112,4 +112,4 @@ jobs:
labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
signoff: true
title: Bump JDK 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
12 changes: 6 additions & 6 deletions .github/workflows/pb-update-jre-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
owner: SAP
repository: SapMachine
tag_filter: sapmachine-(11.*)
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
- name: Update Buildpack Dependency
id: buildpack
run: |-
run: |
#!/usr/bin/env bash

set -euo pipefail
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
LABEL="semver:patch"
fi

echo "::set-output name=old-version::${OLD_VERSION}"
echo "::set-output name=new-version::${VERSION}"
echo "::set-output name=version-label::${LABEL}"
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT"
echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT"
env:
CPE: ${{ steps.dependency.outputs.cpe }}
CPE_PATTERN: ""
Expand All @@ -112,4 +112,4 @@ jobs:
labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
signoff: true
title: Bump JRE 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
Loading