Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release-1.11.x): release 1.11.4 #102

Merged

Conversation

loki-gh-app[bot]
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Feb 26, 2024

🤖 I have created a release beep boop

1.11.4

1.11.4 (2024-02-26)

Features

  • guard against draft being empty (7d737bf)
  • make gh app token optional (f4989af)

Merging this PR will release the artifacts of 7d737bf

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@trevorwhitney
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

1 similar comment
@trevorwhitney
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

@loki-gh-app loki-gh-app bot changed the title chore(release-1.11.x): release 1.11.0 chore(release-1.11.x): release 1.11.4 Feb 26, 2024
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-1.11.x branch from b7daf08 to 3037acb Compare February 26, 2024 21:28
@trevorwhitney trevorwhitney merged commit 18a1c46 into release-1.11.x Feb 26, 2024
1 check was pending
@trevorwhitney trevorwhitney deleted the release-please--branches--release-1.11.x branch February 26, 2024 21:30
@trevorwhitney
Copy link
Collaborator

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-102-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 18a1c46839c610c8c4ed1cf251d2b25a44a46b06

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-102-to-main
# Create the PR body template
PR_BODY=$(gh pr view 102 --json body --template 'Backport 18a1c46839c610c8c4ed1cf251d2b25a44a46b06 from #102{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "chore: [main] chore(release-1.11.x): release 1.11.4" --body-file - --label "autorelease: pending" --label "product-approved" --label "backport" --base main --milestone main --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-102-to-main

# Create a pull request where the `base` branch is `main` and the `compare`/`head` branch is `backport-102-to-main`.

# Remove the local backport branch
git switch main
git branch -D backport-102-to-main

@trevorwhitney
Copy link
Collaborator

trevorwhitney added a commit that referenced this pull request Feb 27, 2024
Squashed commit of the following:

commit 3b28682
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 27 15:33:26 2024 -0700

    fix: roll back over-zealous permissions

commit e5f3695
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 16:33:17 2024 -0700

    fix: give release pipeline write-all permission

commit 713f2a3
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 16:25:37 2024 -0700

    feat: bump release-please

commit 18a1c46
Author: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>
Date:   Mon Feb 26 14:30:32 2024 -0700

    chore(release-1.11.x): release 1.11.4 (#102)

    Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>

commit 7d737bf
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:53:30 2024 -0700

    feat: guard against draft being empty

commit f4989af
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:50:13 2024 -0700

    feat: make gh app token optional

commit 52b438a
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:46:05 2024 -0700

    ci: stupid bash

commit cfbefe6
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:39:32 2024 -0700

    ci: forgot to set the token

commit cea8ba8
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:35:24 2024 -0700

    ci: conditionally use github app token

commit 5c63008
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:10:32 2024 -0700

    ci: mess around with quoting

commit 6eec91f
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 13:05:06 2024 -0700

    ci: give release workflow write-all permission

commit ebb73a9
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 12:42:28 2024 -0700

    ci: fix github output

commit e00a680
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 12:19:07 2024 -0700

    ci: why create release is broken?

commit 89ad82d
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 12:12:59 2024 -0700

    Revert "ci: tweak check release step"

    This reverts commit 6d4f2eb.

commit 6d4f2eb
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 12:10:27 2024 -0700

    ci: tweak check release step

commit 1e54cac
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 11:59:41 2024 -0700

    ci: is it a weird escaping issue?

commit 72b17b9
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 11:38:56 2024 -0700

    ci: trigger release

commit 2c12e5d
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 11:35:34 2024 -0700

    ci: allow non-zero exit when checking release

commit 9474a72
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 11:30:35 2024 -0700

    chore(release-1.11.x): release 1.11.3 (#101)

    Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>

commit 7b861c0
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 11:07:39 2024 -0700

    ci: change gh app token owner

commit 5cd54fc
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 10:41:03 2024 -0700

    fix: guthub app token action reference

commit 5a61a23
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 09:56:14 2024 -0700

    feat: use GH App token

commit cf69d2a
Author: Trevor Whitney <[email protected]>
Date:   Mon Feb 26 08:42:41 2024 -0700

    feat: make createRelease idempotent

commit b59ef02
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 14:37:11 2024 -0700

    chore(release-1.11.x): release 1.11.2 (#100)

commit 176753f
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 13:12:21 2024 -0700

    fix: remove release that didn't happen

commit a2c3dc8
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 12:59:10 2024 -0700

    fix: need to clone release repo to publish release

commit e054504
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 12:54:42 2024 -0700

    chore(release-1.11.x): release 1.11.2 (#99)

commit b070206
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 12:48:46 2024 -0700

    feat: publish release after successful image upload

commit f5b6ce3
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 12:40:26 2024 -0700

    chore(release-1.11.x): release 1.11.1 (#98)

commit 21a4469
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 11:38:08 2024 -0700

    feat: simulate feature

commit 1578cba
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 11:33:42 2024 -0700

    chore: add more logging to should release

commit 2fdeeb8
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 09:16:58 2024 -0700

    chore(release-1.11.x): release 1.11.0 (#97)

commit 977d83d
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 09:09:17 2024 -0700

    fix: version now in title for grouped prs

commit 1e2a057
Author: Trevor Whitney <[email protected]>
Date:   Fri Feb 23 08:59:42 2024 -0700

    chore: debug getVersion

commit cb9da08
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 20:18:28 2024 -0700

    chore: bump release-please

commit 4499fbb
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 17:16:00 2024 -0700

    fix: merge needs a group pr title pattern

commit 0f0d841
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 16:59:38 2024 -0700

    fix: add component to PR title pattern

commit 9150024
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 16:49:44 2024 -0700

    fix: manifest version

    Release-As: 1.11.0

commit 2671056
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 16:48:09 2024 -0700

    fix: try to escape $ again

commit 0ed276e
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 16:35:21 2024 -0700

    fix: escape dollar signs

commit dc70535
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 16:25:00 2024 -0700

    fix: pull request title pattern

commit c723914
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 15:21:42 2024 -0700

    fix: missing $

commit 4be39c6
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 15:12:35 2024 -0700

    fix: add pr_created guards to artifact building

commit 293b371
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 14:55:01 2024 -0700

    feat: make release lib ref configurable

commit 6b01459
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 13:40:05 2024 -0700

    fix: fetch release lib of same branch

commit d844403
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 13:13:04 2024 -0700

    fix: need manifest when determining version as well

commit af941e8
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:57:42 2024 -0700

    feat: pass manifest in config mode

commit 0e5b861
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:35:41 2024 -0700

    fix: try config based release again

commit d4ba76f
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:27:12 2024 -0700

    fix: local config location

commit a670181
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:21:39 2024 -0700

    fix: use local config file

commit 0b61663
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:19:13 2024 -0700

    chore: bump release-please

commit e5a6830
Author: Trevor Whitney <[email protected]>
Date:   Thu Feb 22 11:13:26 2024 -0700

    feat: use auto-generated json config

commit 1d62478
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 16:41:49 2024 -0700

    feat: make golangci-lint version configurable in release workflow

commit 9240e12
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 16:38:37 2024 -0700

    feat: make golangci-lint version configurable

commit fe931ac
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 16:26:01 2024 -0700

    fix: need to remove check-format for this version

commit 627f45d
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 16:14:06 2024 -0700

    feat: check build image is configurable

commit c251e25
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 15:02:00 2024 -0700

    fix: fetch origin before check-forma

commit b628290
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 14:50:15 2024 -0700

    chore: bring back check-format

commit 3cf547b
Author: Trevor Whitney <[email protected]>
Date:   Tue Feb 20 14:43:01 2024 -0700

    chore: debug how to do a git diff

    Release-As: 1.11.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants