Skip to content
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,3 @@ updates:
update-types:
- "minor"
- "patch"
exclude-patterns:
- "github.com/anchore/stereoscope"
- "github.com/testcontainers/testcontainers-go"
- "github.com/docker/docker"
- "github.com/containerd/containerd"
2 changes: 1 addition & 1 deletion .github/workflows/approve-bot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Checkout
if: steps.human-commits.outputs.human_commits == 'false' && steps.unverified-commits.outputs.unverified_commits == 'false'
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Approve
if: steps.human-commits.outputs.human_commits == 'false' && steps.unverified-commits.outputs.unverified_commits == 'false'
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
schedule:
Expand All @@ -21,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Initialize CodeQL
uses: github/codeql-action/init@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compile-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Enable experimental features for Docker daemon and CLI
run: |
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
arch="${{ inputs.arch }}"

- name: Upload compiled artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
if: ${{ inputs.shouldCompile == true || inputs.shouldCompile == 'true' }}
with:
name: '${{ inputs.uploadArtifactName }}'
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/create-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
builders: ${{ steps.builders.outputs.builders }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Setup Go
uses: actions/setup-go@v6
with:
Expand All @@ -47,7 +47,7 @@ jobs:
fail-fast: false # don't cancel all test jobs when one fails
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Setup Go
uses: actions/setup-go@v6
with:
Expand All @@ -56,6 +56,7 @@ jobs:
run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }}
env:
TMPDIR: "${{ runner.temp }}"
GIT_TOKEN: ${{ github.token }}

release:
name: Release
Expand All @@ -69,7 +70,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-tags: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-yaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
lintYaml:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Checkout github-config
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
repository: paketo-buildpacks/github-config
path: github-config
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Lint

on:
push:
branches:
- main
pull_request:
branches:
- main
Expand All @@ -14,15 +11,15 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Setup Go
uses: actions/setup-go@v6
with:
go-version-file: go.mod

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v9
with:
version: latest
args: --timeout 3m0s
4 changes: 2 additions & 2 deletions .github/workflows/push-buildpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Parse Event
id: event
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
password: ${{ env.GCR_PASSWORD }}
registry: ${{ env.GCR_REGISTRY }}

- uses: buildpacks/github-actions/setup-tools@v5.9.5
- uses: buildpacks/github-actions/setup-tools@v5.9.7
- name: Push to DockerHub
if: ${{ steps.parse_configs.outputs.push_to_dockerhub == 'true' }}
id: push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/synchronize-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on:
- ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ github.token }}
19 changes: 16 additions & 3 deletions .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
builders: ${{ steps.builders.outputs.builders }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Setup Go
uses: actions/setup-go@v6
Expand Down Expand Up @@ -49,7 +49,19 @@ jobs:
fail-fast: false # don't cancel all test jobs when one fails
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Free Disk Space
if: vars.RECLAIM_DISK_SPACE == 'true'
uses: paketo-buildpacks/github-config/actions/pull-request/reclaim-disk-space@main
with:
tool-cache: false
android: true
dotnet: true
haskell: true
large-packages: false
docker-images: true
swap-storage: true

- name: Setup Go
uses: actions/setup-go@v6
Expand All @@ -60,6 +72,7 @@ jobs:
run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }}
env:
TMPDIR: "${{ runner.temp }}"
GIT_TOKEN: ${{ github.token }}

roundup:
name: Integration Tests
Expand All @@ -82,7 +95,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: event-payload
path: ${{ github.event_path }}
29 changes: 15 additions & 14 deletions .github/workflows/update-dependencies-from-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ jobs:
compilation-length: ${{ steps.retrieve.outputs.compilation-length }}
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Setup Go
uses: actions/setup-go@v6
with:
go-version-file: go.mod
# hashFiles returns empty string if file does not exist
go-version-file: ${{ hashFiles('dependency/retrieval/go.mod') != '' && 'dependency/retrieval/go.mod' || 'go.mod' }}

- name: Run Retrieve
id: retrieve
Expand Down Expand Up @@ -64,13 +65,13 @@ jobs:
echo "compilation-length=$complength" >> "$GITHUB_OUTPUT"

- name: Upload `${{ steps.retrieve.outputs.metadata-filepath }}`
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: metadata.json
path: ${{ steps.retrieve.outputs.metadata-filepath }}

- name: Upload `${{ steps.retrieve.outputs.from-source-metadata-filepath }}`
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: from-source-metadata.json
path: ${{ steps.retrieve.outputs.from-source-metadata-filepath }}
Expand All @@ -86,7 +87,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Has Compilation Action?
id: compile-check
Expand Down Expand Up @@ -121,7 +122,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Make Temporary Artifact Directory
id: make-outputdir
Expand Down Expand Up @@ -191,10 +192,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Download artifact files
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: "${{ needs.retrieve.outputs.id }}-${{ matrix.includes.version }}-${{ matrix.includes.os != '' && matrix.includes.os || 'linux' }}-${{ matrix.includes.arch != '' && matrix.includes.arch || 'amd64' }}-${{ matrix.includes.target }}"

Expand All @@ -209,7 +210,7 @@ jobs:
echo "checksum-file=$(basename ./*.tgz.checksum)" >> "$GITHUB_OUTPUT"

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
aws-access-key-id: ${{ secrets.AWS_S3_DEPENDENCIES_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_S3_DEPENDENCIES_SECRET_ACCESS_KEY }}
Expand All @@ -228,7 +229,7 @@ jobs:
run: echo "checksum=$(cat ${{ steps.get-file-names.outputs.checksum-file }})" >> "$GITHUB_OUTPUT"

- name: Download metadata.json
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
name: metadata.json

Expand Down Expand Up @@ -263,7 +264,7 @@ jobs:
arch: ${{ matrix.includes.arch }}

- name: Upload modified metadata
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{ steps.dependency-metadata.outputs.file }}
path: ${{ steps.dependency-metadata.outputs.file }}
Expand All @@ -284,7 +285,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Checkout Branch
uses: paketo-buildpacks/github-config/actions/pull-request/checkout-branch@main
Expand All @@ -298,7 +299,7 @@ jobs:

# Metadata file for the non-compiled dependencies, if there are any
- name: Download metadata.json file
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
path: "${{ steps.make-outputdir.outputs.outputdir }}/metadata-files"
pattern: "from-source-metadata.json"
Expand All @@ -308,7 +309,7 @@ jobs:
# Download each metadata file, and combine them into one
- name: Download individual metadata-file.json file(s)
if: ${{ needs.update-metadata.result == 'success' }}
uses: actions/download-artifact@v4
uses: actions/download-artifact@v6
with:
path: "${{ steps.make-outputdir.outputs.outputdir }}/metadata-files"
pattern: "*metadata-file.json"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-github-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}

- name: Checkout github-config
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
repository: paketo-buildpacks/github-config
path: github-config
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/update-go-mod-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Checkout PR Branch
uses: paketo-buildpacks/github-config/actions/pull-request/checkout-branch@main
with:
branch: automation/go-mod-update/update-main
- name: Setup Go
id: setup-go
uses: actions/setup-go@v6
# Fetching the latest stable Go version
with:
go-version-file: go.mod
go-version: stable
- name: Get current go toolchain version
id: current-go-version
uses: paketo-buildpacks/github-config/actions/update-go-mod-version@main
Expand Down
4 changes: 2 additions & 2 deletions scripts/.util/tools.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"createpackage": "v1.73.0",
"jam": "v2.15.0",
"jam": "v2.15.1",
"libpaktools": "v0.3.0",
"pack": "v0.38.2"
"pack": "v0.39.1"
}
5 changes: 3 additions & 2 deletions scripts/.util/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ function util::tools::arch() {
echo ""
elif [[ "${1:-}" == "--format-amd64-x86_64" ]]; then
echo "x86_64"
elif [[ "${1:-}" == "--format-amd64-x86-64" ]]; then
echo "x86-64"
else
echo "amd64"
fi
Expand Down Expand Up @@ -156,7 +158,7 @@ function util::tools::pack::install() {

util::print::title "Installing pack ${version}"

os=$(util::tools::os macos)
os=$(util::tools::os)
arch=$(util::tools::arch --blank-amd64)

curl "https://github.com/buildpacks/pack/releases/download/${version}/pack-${version}-${os}${arch:+-$arch}.tgz" \
Expand All @@ -167,7 +169,6 @@ function util::tools::pack::install() {
if [[ "${pack_config_enable_experimental}" == "true" ]]; then
"${dir}"/pack config experimental true
fi

else
util::print::info "Using pack $("${dir}"/pack version)"
fi
Expand Down
1 change: 1 addition & 0 deletions scripts/integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ function builder_images::pull() {
pack inspect-builder "${builder}" --output json \
| jq -r '.remote_info.run_images[0].name'
)"

lifecycle_image="index.docker.io/buildpacksio/lifecycle:$(
pack inspect-builder "${builder}" --output json \
| jq -r '.remote_info.lifecycle.version'
Expand Down
Loading