From 8b7f79763b951e89ff9e1e138b8e1fd5579fb751 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Wed, 12 Apr 2023 18:06:47 -0400 Subject: [PATCH] Update pipeline-builder (#226) Signed-off-by: Daniel Mikusa --- .github/dependabot.yml | 2 ++ .github/labels.yml | 15 ++++++++++ .github/pipeline-version | 2 +- .github/workflows/pb-minimal-labels.yml | 4 +-- .github/workflows/pb-tests.yml | 9 ++++-- .github/workflows/pb-update-go.yml | 35 ++++++++++++++++-------- .github/workflows/pb-update-pipeline.yml | 14 ++++++---- 7 files changed, 58 insertions(+), 23 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/labels.yml b/.github/labels.yml index 270dd19..73f0613 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -25,3 +25,18 @@ - name: type:task description: A general task color: e3d9fc +- name: type:informational + description: Provides information or notice to the community + color: e3d9fc +- name: type:poll + description: Request for feedback from the community + color: e3d9fc +- name: note:ideal-for-contribution + description: An issue that a contributor can help us with + color: 54f7a8 +- name: note:on-hold + description: We can't start working on this issue yet + color: 54f7a8 +- name: note:good-first-issue + description: A good first issue to get started with + color: 54f7a8 diff --git a/.github/pipeline-version b/.github/pipeline-version index 61b813d..359c410 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.25.2 +1.32.0 diff --git a/.github/workflows/pb-minimal-labels.yml b/.github/workflows/pb-minimal-labels.yml index 8f4aab5..75ea2ac 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@v2 + - uses: mheap/github-action-required-labels@v4 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@v2 + - uses: mheap/github-action-required-labels@v4 with: count: 1 labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 2bdd031..0f95261 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: @@ -16,9 +21,9 @@ 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" + go-version: "1.20" - name: Install richgo run: | #!/usr/bin/env bash diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index fd720ee..df93d14 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -9,11 +9,11 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: "1.18" + go-version: "1.20" - uses: actions/checkout@v3 - - name: Update Go Version + - name: Update Go Version & Modules id: update-go run: | #!/usr/bin/env bash @@ -35,15 +35,26 @@ jobs: git add go.mod go.sum git checkout -- . - echo "::set-output name=old-go-version::${OLD_GO_VERSION}" - echo "::set-output name=go-version::${GO_VERSION}" + if [ "$OLD_GO_VERSION" == "$GO_VERSION" ]; then + COMMIT_TITLE="Bump Go Modules" + COMMIT_BODY="Bumps Go modules used by the project. See the commit for details on what modules were updated." + COMMIT_SEMVER="semver:patch" + else + COMMIT_TITLE="Bump Go from ${OLD_GO_VERSION} to ${GO_VERSION}" + COMMIT_BODY="Bumps Go from ${OLD_GO_VERSION} to ${GO_VERSION} and update Go modules used by the project. See the commit for details on what modules were updated." + COMMIT_SEMVER="semver:minor" + fi + + 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 + GO_VERSION: "1.20" + - uses: peter-evans/create-pull-request@v5 with: author: ${{ secrets.IMPLEMENTATION_GITHUB_USERNAME }} <${{ secrets.IMPLEMENTATION_GITHUB_USERNAME }}@users.noreply.github.com> body: |- - Bumps Go from `${{ steps.update-go.outputs.old-go-version }}` to `${{ steps.update-go.outputs.go-version }}`. + ${{ steps.update-go.outputs.commit-body }}
Release Notes @@ -51,11 +62,11 @@ jobs:
branch: update/go commit-message: |- - Bump Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }} + ${{ steps.update-go.outputs.commit-title }} - Bumps Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }}. + ${{ steps.update-go.outputs.commit-body }} delete-branch: true - labels: semver:minor, type:task + labels: ${{ steps.update-go.outputs.commit-semver }}, type:task signoff: true - title: Bump Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }} + title: ${{ steps.update-go.outputs.commit-title }} token: ${{ secrets.IMPLEMENTATION_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index 12667ab..6f4cd17 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@v3 + - uses: actions/setup-go@v4 with: - go-version: "1.18" + go-version: "1.20" - name: Install octo run: | #!/usr/bin/env bash @@ -57,13 +57,15 @@ jobs: git add .github/ git checkout -- . - echo "::set-output name=old-version::${OLD_VERSION}" - echo "::set-output name=new-version::${NEW_VERSION}" - echo "::set-output name=release-notes::${RELEASE_NOTES//$'\n'/%0A}" + echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" + echo "new-version=${NEW_VERSION}" >> "$GITHUB_OUTPUT" + + DELIMITER=$(openssl rand -hex 16) # roughly the same entropy as uuid v4 used in https://github.com/actions/toolkit/blob/b36e70495fbee083eb20f600eafa9091d832577d/packages/core/src/file-command.ts#L28 + printf "release-notes<<%s\n%s\n%s\n" "${DELIMITER}" "${RELEASE_NOTES}" "${DELIMITER}" >> "${GITHUB_OUTPUT}" # see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings env: DESCRIPTOR: .github/pipeline-descriptor.yml GITHUB_TOKEN: ${{ secrets.IMPLEMENTATION_GITHUB_TOKEN }} - - uses: peter-evans/create-pull-request@v4 + - uses: peter-evans/create-pull-request@v5 with: author: ${{ secrets.IMPLEMENTATION_GITHUB_USERNAME }} <${{ secrets.IMPLEMENTATION_GITHUB_USERNAME }}@users.noreply.github.com> body: |-