Skip to content

Commit

Permalink
Merge branch 'main' into renovate/codecov-4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
piontec authored Feb 27, 2024
2 parents ae99755 + 54efc11 commit 6a7d968
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
architect: giantswarm/[email protected].0
architect: giantswarm/[email protected].1
codecov: codecov/[email protected]

workflows:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/zz_generated.create_release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.18.2
# devctl@6.20.0
#
name: Create Release
on:
Expand Down Expand Up @@ -142,6 +142,15 @@ jobs:
title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}"
run: |
gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }}
- name: Enable auto-merge for PR
env:
GITHUB_TOKEN: "${{ secrets.TAYLORBOT_GITHUB_ACTION }}"
base: "${{ github.ref }}"
branch: "${{ github.ref }}-version-bump"
version: "${{ needs.gather_facts.outputs.version }}"
title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}"
run: |
gh pr merge --auto --squash "${{ env.branch }}" || echo "::warning::Auto-merge not allowed. Please adjust the repository settings."
create_release:
name: Create release
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.create_release_pr.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.18.2
# devctl@6.20.0
#
name: Create Release PR
on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.gitleaks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.18.2
# devctl@6.20.0
#
name: gitleaks

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.run_ossf_scorecard.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.18.2
# devctl@6.20.0
#

# This workflow uses actions that are not certified by GitHub. They are provided
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.19.1 AS binaries
# renovate: datasource=github-releases depName=kubernetes/kubernetes
ARG KUBECTL_VER=v1.26.2
# renovate: datasource=github-releases depName=moby/moby
ARG DOCKER_VER=v25.0.2
ARG DOCKER_VER=v25.0.3
# renovate: datasource=github-releases depName=kubernetes-sigs/kind
ARG KIND_VER=v0.17.0
# renovate: datasource=github-releases depName=giantswarm/apptestctl
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.18.2
# devctl@6.20.0
#

include Makefile.*.mk
Expand Down

0 comments on commit 6a7d968

Please sign in to comment.