Skip to content

Commit

Permalink
adds source_classifier input to maven-dep action (#377)
Browse files Browse the repository at this point in the history
  • Loading branch information
pivotal-david-osullivan authored Sep 27, 2023
1 parent 79d3297 commit 9cbe72f
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,20 @@ dependencies:
group_id: org.cloudfoundry
artifact_id: tomcat-access-logging-support
version_regex: "^[\\d]+\\.[\\d]+\\.[\\d]+\\.RELEASE$"
source_classifier: sources
- id: tomcat-lifecycle-support
uses: docker://ghcr.io/paketo-buildpacks/actions/maven-dependency:main
with:
uri: https://repo1.maven.org/maven2
group_id: org.cloudfoundry
artifact_id: tomcat-lifecycle-support
version_regex: "^[\\d]+\\.[\\d]+\\.[\\d]+\\.RELEASE$"
source_classifier: sources
- id: tomcat-logging-support
uses: docker://ghcr.io/paketo-buildpacks/actions/maven-dependency:main
with:
uri: https://repo1.maven.org/maven2
group_id: org.cloudfoundry
artifact_id: tomcat-logging-support
version_regex: "^[\\d]+\\.[\\d]+\\.[\\d]+\\.RELEASE$"
source_classifier: sources
2 changes: 1 addition & 1 deletion .github/workflows/pb-update-go.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Update Go
"on":
schedule:
- cron: 37 2 * * 1
- cron: 15 2 * * 1
workflow_dispatch: {}
jobs:
update:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pb-update-tomcat-10-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -92,6 +94,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 10\.1\.[\d]+
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pb-update-tomcat-10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -92,6 +94,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 10\.0\.[\d]+
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pb-update-tomcat-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -91,6 +93,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 8\.[\d]+\.[\d]+
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pb-update-tomcat-9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -91,6 +93,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: 9\.[\d]+\.[\d]+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
with:
artifact_id: tomcat-access-logging-support
group_id: org.cloudfoundry
source_classifier: sources
uri: https://repo1.maven.org/maven2
version_regex: ^[\d]+\.[\d]+\.[\d]+\.RELEASE$
- name: Update Buildpack Dependency
Expand All @@ -71,7 +72,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -94,6 +97,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/pb-update-tomcat-lifecycle-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
with:
artifact_id: tomcat-lifecycle-support
group_id: org.cloudfoundry
source_classifier: sources
uri: https://repo1.maven.org/maven2
version_regex: ^[\d]+\.[\d]+\.[\d]+\.RELEASE$
- name: Update Buildpack Dependency
Expand All @@ -71,7 +72,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -94,6 +97,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/pb-update-tomcat-logging-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
with:
artifact_id: tomcat-logging-support
group_id: org.cloudfoundry
source_classifier: sources
uri: https://repo1.maven.org/maven2
version_regex: ^[\d]+\.[\d]+\.[\d]+\.RELEASE$
- name: Update Buildpack Dependency
Expand All @@ -71,7 +72,9 @@ jobs:
--purl-pattern "${PURL_PATTERN:-}" \
--purl "${PURL:-}" \
--uri "${URI}" \
--sha256 "${SHA256}"
--sha256 "${SHA256}" \
--source "${SOURCE_URI}" \
--source-sha256 "${SOURCE_SHA256}"
git add buildpack.toml
git checkout -- .
Expand All @@ -94,6 +97,8 @@ jobs:
PURL: ${{ steps.dependency.outputs.purl }}
PURL_PATTERN: ""
SHA256: ${{ steps.dependency.outputs.sha256 }}
SOURCE_SHA256: ${{ steps.dependency.outputs.source_sha256 }}
SOURCE_URI: ${{ steps.dependency.outputs.source }}
URI: ${{ steps.dependency.outputs.uri }}
VERSION: ${{ steps.dependency.outputs.version }}
VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
Expand Down

0 comments on commit 9cbe72f

Please sign in to comment.