From 74df0ad0f1fd97b629e8fefa569a31487b12c6e3 Mon Sep 17 00:00:00 2001 From: paketocommunity Date: Wed, 22 Mar 2023 05:00:43 +0000 Subject: [PATCH] Bump pipeline from 1.30.0 to 1.31.0 Bumps pipeline from 1.30.0 to 1.31.0. Signed-off-by: GitHub --- .github/dependabot.yml | 2 ++ .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 2 +- .github/workflows/pb-tests.yml | 37 +++++------------------- .github/workflows/pb-update-go.yml | 2 +- .github/workflows/pb-update-pipeline.yml | 2 +- .github/workflows/pb-update-rust.yml | 2 +- 7 files changed, 14 insertions(+), 35 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5302b7b..2adccd4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,8 @@ updates: directory: / schedule: interval: daily + ignore: + - dependency-name: github.com/onsi/gomega labels: - semver:patch - type:dependency-upgrade diff --git a/.github/pipeline-version b/.github/pipeline-version index 034552a..34aae15 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.30.0 +1.31.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 4eaa5f0..f7fd494 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -23,7 +23,7 @@ jobs: password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: "1.18" - name: Install create-package diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 87875b6..fc88179 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -1,5 +1,10 @@ name: Tests "on": + merge_group: + types: + - checks_requested + branches: + - main pull_request: {} push: branches: @@ -10,35 +15,7 @@ jobs: runs-on: - ubuntu-latest steps: - - name: Docker login gcr.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.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 }} - - name: Docker login gcr.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.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 + - uses: actions/setup-go@v4 with: go-version: "1.18" - name: Install create-package @@ -202,7 +179,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} path: ${{ env.HOME }}/go/pkg/mod restore-keys: ${{ runner.os }}-go- - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: "1.18" - name: Install richgo diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index 6671b9b..94ff1db 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: "1.18" - uses: actions/checkout@v3 diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index 82c0fdd..1aefe18 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -14,7 +14,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: "1.18" - name: Install octo diff --git a/.github/workflows/pb-update-rust.yml b/.github/workflows/pb-update-rust.yml index 3a8cec3..269fe99 100644 --- a/.github/workflows/pb-update-rust.yml +++ b/.github/workflows/pb-update-rust.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: "1.18" - name: Install update-buildpack-dependency