diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 5d750ec..1bc481a 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/**', diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 01a3776..1915b2e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,13 +33,13 @@ jobs: steps: - name: Setup Docker Buildx - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3 + uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3 with: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 with: submodules: true @@ -54,13 +54,13 @@ jobs: BUILD_ARGS: "--load" - name: Publish Artifacts to GitHub - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: output path: _output/** - name: Login to Upbound - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 + uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3 if: env.XPKG_ACCESS_ID != '' with: registry: xpkg.upbound.io diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index d310447..885d97a 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -3,7 +3,8 @@ name: End to End Testing on: issue_comment: types: [created] - + pull_request: + types: [labeled] jobs: e2e: uses: upbound/official-providers-ci/.github/workflows/pr-comment-trigger.yml@main diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 4c9f1ea..1d2de5a 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - name: Create Tag uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1 diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index acbb91b..a796551 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -5,9 +5,9 @@ jobs: name: runner / yamllint runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - name: yamllint - uses: reviewdog/action-yamllint@1dca3ad811867be18fbe293a9818d715a6c2cd46 # v1.20.0 + uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 with: reporter: github-pr-review filter_mode: nofilter diff --git a/Makefile b/Makefile index 0c292e7..909605c 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ PLATFORMS ?= linux_amd64 # Tool Versions # ------------------ -UP_VERSION = v0.38.0 +UP_VERSION = v0.40.1 UP_CHANNEL = stable CROSSPLANE_CLI_VERSION = v1.18.0 CROSSPLANE_VERSION = v1.18.0-up.1