From 0294584a977395c0b02551a610a9a82a6169d001 Mon Sep 17 00:00:00 2001 From: upbound-bot Date: Tue, 20 May 2025 19:14:29 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows'=20with=20remote=20'shared/configurations-new-devex/wor?= =?UTF-8?q?kflows'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/composition-tests.yaml | 4 ++-- .github/workflows/e2e.yaml | 5 ++--- .github/workflows/yamllint.yaml | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0a15e4c..855e582 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,11 +21,11 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@v4 - name: Install and login with up if: env.UP_API_TOKEN != '' && env.UP_ORG != '' - uses: upbound/action-up@53fe6395637d884c80d2bbc8c2d75d0ece776ced # v1 + uses: upbound/action-up@v1 with: api-token: ${{ secrets.UP_API_TOKEN }} organization: ${{ secrets.UP_ORG }} @@ -40,7 +40,7 @@ jobs: - name: Build and Push Upbound project if: env.UP_API_TOKEN != '' - uses: upbound/action-up-project@87016022642d4076f1360639bdf0f04527c28983 # v1 + uses: upbound/action-up-project@v1 with: push-project: true tag: ${{ inputs.version || '' }} diff --git a/.github/workflows/composition-tests.yaml b/.github/workflows/composition-tests.yaml index 5bd6cbe..e2f5677 100644 --- a/.github/workflows/composition-tests.yaml +++ b/.github/workflows/composition-tests.yaml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@v4 - name: Install up - uses: upbound/action-up@53fe6395637d884c80d2bbc8c2d75d0ece776ced # v1 + uses: upbound/action-up@v1 with: skip-login: true diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index b716a27..113f39c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -22,11 +22,11 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@v4 - name: Install and login with up if: env.UP_API_TOKEN != '' && env.UP_ORG != '' - uses: upbound/action-up@53fe6395637d884c80d2bbc8c2d75d0ece776ced # v1 + uses: upbound/action-up@v1 with: api-token: ${{ env.UP_API_TOKEN }} organization: ${{ env.UP_ORG }} @@ -46,5 +46,4 @@ jobs: run: up ctx ${{ env.UP_ORG }}/upbound-gcp-us-central-1/${{ env.UP_GROUP }} - name: Run e2e tests - if: env.UP_API_TOKEN != '' && env.UP_ORG != '' run: up test run tests/* --e2e diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index f159c49..acbb91b 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: yamllint - uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 + uses: reviewdog/action-yamllint@1dca3ad811867be18fbe293a9818d715a6c2cd46 # v1.20.0 with: reporter: github-pr-review filter_mode: nofilter From d3c008f1c8fd118f6d512fb305bf909dfafee462 Mon Sep 17 00:00:00 2001 From: upbound-bot Date: Tue, 20 May 2025 19:14:29 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/re?= =?UTF-8?q?novate.json5'=20with=20remote=20'shared/configurations-new-deve?= =?UTF-8?q?x/renovate.json5'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json5 | 43 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 5d750ec..162dd92 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -5,13 +5,18 @@ 'helpers:pinGitHubActionDigests', ':semanticCommits', ], - rebaseWhen: 'conflicted', + rebaseWhen: 'auto', + rebaseLabel: 'rebase', prConcurrentLimit: 5, + autoApprove: true, + automerge: true, + automergeType: 'pr', baseBranches: [ 'main', ], labels: [ 'automated', + 'run-e2e-tests', ], ignorePaths: [ // default renovate ignorePaths without '**/examples/**' '**/node_modules/**', @@ -34,16 +39,10 @@ }, { matchFileNames: [ - 'crossplane.yaml', + 'upbound.yaml', ], groupName: 'crossplane dependencies', }, - { - matchFileNames: [ - 'Makefile', - ], - groupName: 'Makefile dependencies', - }, { matchManagers: ['crossplane'], matchFileNames: ['examples/**'], @@ -53,33 +52,9 @@ customManagers: [ { customType: 'regex', - description: 'Bump up version in the Makefile', - fileMatch: [ - '^Makefile$', - ], - matchStrings: [ - 'UP_VERSION = (?.*?)\\n', - ], - datasourceTemplate: 'github-releases', - depNameTemplate: 'upbound/up', - }, - { - customType: 'regex', - description: 'Bump uptest version in the Makefile', - fileMatch: [ - '^Makefile$', - ], - matchStrings: [ - 'UPTEST_VERSION = (?.*?)\\n', - ], - datasourceTemplate: 'github-releases', - depNameTemplate: 'upbound/uptest', - }, - { - customType: 'regex', - description: 'Bump providers/functions/configurations in crossplane.yaml', + description: 'Bump providers/functions/configurations in upbound.yaml', fileMatch: [ - 'crossplane.yaml', + 'upbound.yaml', ], matchStrings: [ '#\\s*renovate:\\s*datasource=(?[^\\s]+)\\s+depName=(?[^\\s]+)\\s*\\n\\s*version:\\s*"(?[^"]+)"',