From 5726c1c569330e4e7a3275b15edc25e9e518bf82 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Sun, 28 Jul 2024 00:11:36 -0400 Subject: [PATCH] Update pipeline-builder to v1.39.0 Signed-off-by: Daniel Mikusa --- .github/pipeline-version | 2 +- .github/workflows/pb-minimal-labels.yml | 4 ++-- .github/workflows/pb-synchronize-labels.yml | 2 +- .github/workflows/pb-tests.yml | 9 ++++----- .github/workflows/pb-update-go.yml | 12 ++++++------ .github/workflows/pb-update-pipeline.yml | 14 ++++++++++---- .gitignore | 7 +++++++ 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/pipeline-version b/.github/pipeline-version index 359c410..5edffce 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.32.0 +1.39.0 diff --git a/.github/workflows/pb-minimal-labels.yml b/.github/workflows/pb-minimal-labels.yml index 75ea2ac..767ff02 100644 --- a/.github/workflows/pb-minimal-labels.yml +++ b/.github/workflows/pb-minimal-labels.yml @@ -12,7 +12,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v4 + - uses: mheap/github-action-required-labels@v5 with: count: 1 labels: semver:major, semver:minor, semver:patch @@ -22,7 +22,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v4 + - uses: mheap/github-action-required-labels@v5 with: count: 1 labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml index 8f93206..21464b5 100644 --- a/.github/workflows/pb-synchronize-labels.yml +++ b/.github/workflows/pb-synchronize-labels.yml @@ -11,7 +11,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: micnncim/action-label-syncer@v1 env: GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index a08cbfb..cceeba5 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -15,15 +15,15 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} path: ${{ env.HOME }}/go/pkg/mod restore-keys: ${{ runner.os }}-go- - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Run Tests run: | #!/usr/bin/env bash @@ -31,4 +31,3 @@ jobs: set -euo pipefail make test - diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index 4ab3c6a..1d23e8b 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -9,10 +9,10 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: "1.20" - - uses: actions/checkout@v3 + go-version: "1.22" + - uses: actions/checkout@v4 - name: Update Go Version & Modules id: update-go run: | @@ -29,7 +29,7 @@ jobs: go mod edit -go="$GO_VERSION" go mod tidy - go get -u all + go get -u -t ./... go mod tidy git add go.mod go.sum @@ -49,8 +49,8 @@ jobs: echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT" echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT" env: - GO_VERSION: "1.20" - - uses: peter-evans/create-pull-request@v5 + GO_VERSION: "1.22" + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: |- diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index cfe2527..2c05223 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -14,9 +14,9 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install octo run: | #!/usr/bin/env bash @@ -24,7 +24,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo@latest - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update Pipeline id: pipeline run: | @@ -55,6 +55,12 @@ jobs: ) git add .github/ + git add .gitignore + + if [ -f scripts/build.sh ]; then + git add scripts/build.sh + fi + git checkout -- . echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" @@ -65,7 +71,7 @@ jobs: env: DESCRIPTOR: .github/pipeline-descriptor.yml GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: |- diff --git a/.gitignore b/.gitignore index 1f68983..2f65ee4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +bin/ +linux/ +dependencies/ +package/ +scratch/ +