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.

Sign up for GitHub

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

Jump to bottom

build(aqua-proj): 🌊 major aqua major (major) #93

Merged
merged 1 commit into from
Jan 16, 2025
Merged

build(aqua-proj): 🌊 major aqua major (major) #93

merged 1 commit into from
Jan 16, 2025

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jan 16, 2025

This PR contains the following updates:

Package Update Change OpenSSF
charmbracelet/glow major v1.5.1 -> v2.0.0 OpenSSF Scorecard
git-town/git-town major v14.4.1 -> v17.2.0 OpenSSF Scorecard

Release Notes

charmbracelet/glow (charmbracelet/glow)

v2.0.0

Compare Source

Hello v2!

This release contains a massive amount of bug fixes and rendering improvements, many of which come by way of Glamour v0.8.0 which was released a few weeks ago.

As a bonus, the latest version of Glamour includes support for Tokyo Night.

glow -s "tokyo-night"
Tokyo Night x Glamour

Additionally, the stash feature has been removed.

Changelog
New!
Fixed!
Deps
Other Stuff
Verifying the artifacts

First, download the checksums.txt file, for example, with wget:

wget 'https://github.com/charmbracelet/glow/releases/download/v2.0.0/checksums.txt'

Then, verify it using cosign:

cosign verify-blob \
  --certificate-identity 'https://github.com/charmbracelet/meta/.github/workflows/goreleaser.yml@refs/heads/main' \
  --certificate-oidc-issuer 'https://token.actions.githubusercontent.com' \
  --cert 'https://github.com/charmbracelet/glow/releases/download/v2.0.0/checksums.txt.pem' \
  --signature 'https://github.com/charmbracelet/glow/releases/download/v2.0.0/checksums.txt.sig' \
  ./checksums.txt

If the output is Verified OK, you can safely use it to verify the checksums of other artifacts you downloaded from the release using sha256sum:

sha256sum --ignore-missing -c checksums.txt

Done! You artifacts are now verified!

The Charm logo

Thoughts? Questions? We love hearing from you. Feel free to reach out on Twitter, The Fediverse, or on Discord.

git-town/git-town (git-town/git-town)

v17.2.0

Compare Source

New Features
  • The new always-merge ship strategy always creates a merge commit when shipping a branch (#​4381).
  • git town prepend now has a --beam option. When enabled, it allows the user to choose one or more commits to move into the new branch that is getting prepended (#​4356).
  • git town prepend now has a --propose flag. When enabled, it automatically proposes the new branch. This is meant to be used together with --beam (#​4377).
  • Git Town's hack command can now make any branch type a feature branch (#​4373).
  • The new git town status show command displays details about the currently interrupted Git Town command (#​4457).
  • Git Town now adds a message to entries it creates on the Git stash. This helps identify which stash entries were created by Git Town (#​4479).
  • If the only problem Git Town encounters is conflicts when running git stash pop at the end, it drops the stash entry and no longer returns with an error (#​4480).
Bug Fixes
  • The setup assistant no longer crashes when run in a brand-new repository (#​4365).
  • git town status reset now works (#​4469).
Contributors

Shoutout to @​Crocmagnon, @​kevgo, @​legeana, @​lud-wj, @​ruudk, @​stephenwade, @​wayne-zhan for contributing feedback, ideas, documentation, and code to 104 shipped PRs and 7 resolved issues!

v17.1.1

Compare Source

Git Town 17.1.1 ships a bug fix that unblocks BitBucket Datacenter users.

Bug Fixes
  • Fixes a bug in the BitBucket-Datacenter driver (#​4371).
Contributors

Shoutout to @​Crocmagnon, @​kevgo, @​stephenwade for contributing bug fixes and ideas to 13 shipped PRs.

v17.1.0

Compare Source

Git Town 17.1 unblocks users who have submitted urgent issues.

New Features
  • The configuration file can now also be named ".git-town.toml", in addition to ".git-branches.toml". This helps users locate it when looking for "Git Town configuration" (#​4343).
  • Supports development versions of Git (#​4344).
  • git town switch no longer asks for ancestry information. This avoids the risk of accidentally selecting a wrong parent branch when one is under the assumption of selecting a branch to switch to (#​4340).
  • Git Town now uses full-length SHA values to address commits. This improves reliability in very large repositories (#​4339).
Bug Fixes
  • The setup assistant now allows configuring a "BitBucket-Datacenter" setup (#​4360).
Contributors

Shoutout to @​kevgo, @​lud-wj, @​pratikpc, @​ruudk, @​stephenwade for contributing feedback, ideas, documentation, and code to 28 shipped PRs and 5 resolved issues!

v17.0.0

Compare Source

Git Town v17 modernizes some outdated concepts that were already documented. As always with major new Git Town releases, all changes are backwards compatible, so Git Town users don't need to change anything. The major version bump is merely a signal that you might need to update some of your own tooling around Git Town.

BREAKING CHANGES
  • The configuration setting create-prototype-branches gets generalized into new-branch-type, which allows giving new branches all available branch types (#​3913).
  • The output of git town config now displays data organized in more sections (#​3866).
  • The config file gets generated without comments now, improving its readability (#​4335)
  • The output of git town config now indicates more precisely whether an configuration setting is not provided or empty (#​4265).
New Features
  • When removing a branch, git town sync and git town delete now also remove the changes of those branches from their descendents (#​4189).
  • git town set-parent now also removes the changes from former parent branches (#​3473).
  • Git Town can now auto-resolve merge conflicts that include deleted files (#​4289).
  • The name of the Git remote used for development is now configurable (#​4165).
  • The setup assistant (git town config setup) now asks for the sync-prototype-strategy.
  • git town config now displays the sync-prototype-strategy.
Bug Fixes
  • Git Town no longer pops up the editor when continuing a command that got stuck in a rebase in certain situations (#​4285).
  • Now only updates Git aliases when auto-updating of outdated configuration entries that aren't Git Town settings (#​4304).
Contributors

Shoutout to @​Crocmagnon, @​WhosNickDoglio, @​alphatroya, @​avaz, @​erik-rw, @​kevgo, @​koppor, @​matthewgonzalez, @​mklauer, @​nishchay-manwani-glean, @​pandvan, @​ruudk, @​sheldonhull, @​smaldored, @​stephenwade for contributing feedback, ideas, documentation, and code to 70 shipped PRs and 13 resolved issues!

v16.7.0

Compare Source

New Features
  • Support for BitBucket Datacenter (#​4239)
Bug Fixes
  • Fixes a regression where branches shipped at the remote were no longer cleaned up (#​4222)
  • Fixes a regression where branches that were shipped at the remote and deleted manually on the local machine were no longer cleaned up (#​4132)
  • Correctly handles leading and trailing spaces in Git metadata branch lists (#​4240)
  • git town status reset now works even if the persisted status is invalid (#​4236)
Contributors

Shoutout to @​Crocmagnon, @​alexdavid, @​kevgo, @​ruudk, @​stephenwade for contributing feedback, ideas, documentation, and code to 26 shipped pull requests and 6 resolved issues!

v16.6.1

Compare Source

Bug Fixes
  • git town ship no longer closes child proposals when using the fast-forward ship-strategy (#​4210)
  • git town propose no longer opens the browser when proposing a branch that was deleted at the remote (#​4171)
  • Bash-based installer makes the binary executable (#​4231)
  • Stability improvements (#​4216)
Contributors

Shoutout to @​EngHabu, @​kevgo, @​stephenwade, @​thatch, @​tranhl for contributing feedback, ideas, documentation, and code to 20 shipped PRs and 6 resolved issues!

v16.6.0

Compare Source

New Features
  • Git Town now auto-resolves phantom merge conflicts for the merge and compress sync-feature-strategy (#​4183). This eliminates the need to manually resolve unnecessary merge conflicts when you ship the oldest branch in a stack and then sync the rest of the stack.
  • The new git town merge command merges two adjacent branches in a branch stack (#​4196).
Bug Fixes
  • Git Town's new capabilities-driven architecture now only attempts to change proposals if the hosting platform supports it. This reduces error messages by preventing unsupported operations (#​4203, #​4200).
  • Git Town now always syncs a branch with its parent branch before syncing with its tracking branch (#​4193).
Contributors

Big thanks to @​IGassmann, @​ceilfors, @​heisencoder, @​kevgo, @​mball-agathos, @​stephenwade, @​tranhl for contributing invaluable ideas to 30 shipped PRs and 2 resolved issues.

v16.5.0

Compare Source

New Features
  • git town sync now automatically deletes a local branch if its remote tracking branch is gone, without attempting to sync it first--assuming the branch was in sync before Git Town ran. (#​3641).
  • The new git town rename command replaces the current git town rename-branch command. The rename-branch command is now deprecated and will be removed in a future release. Please update your tooling to use git town rename from now on. Existing Git aliases calling git town rename-branch get automatically updated to the new commands (#​4038).
  • Same for the new delete command, it replaces the now deprecated kill command. (#​4039).
  • You can now run git town branch in the middle of an unfinished sync (#​4108).
Bug Fixes
  • git town ship is now resilient against concurrently running Git processes (#​4142).
  • git town propose now pushes prototype branches after converting them to feature branches (#​4109).
  • git town propose now uses the first existing ancestor branch as the parent if the current parent branch was shipped or deleted remotely (#​4135).
Contributors

Big thanks to @​JamieMcKernanKaizen, @​PowerSchill, @​bengeois, @​kevgo, @​ruudk, @​sergej-koscejev, @​stephenwade, @​tranhl, @​vectro for contributing to 53 shipped PRs and 12 resolved issues!

v16.4.1

Compare Source

Thanks to @​bengeois, @​kevgo, @​ruudk, @​sergej-koscejev, @​stephenwade, @​tranhl for contributing great feedback, ideas, and code to 14 shipped PRs and 5 resolved issues!

Bug Fixes
  • disable rebase.updateRefs if your Git version supports it (#​4101)

v16.4.0

Compare Source

Git Town 16.4 improves the usability in busy monorepos as well as the stability and resilience of Git Town in more environments.

Many thanks to @​FirelightFlagboy, @​JamieMcKernanKaizen, @​alexw10, @​blaggacao, @​charlierudolph, @​ericcao52, @​ianjsikes, @​kevgo, @​ruudk, @​sheldonhull, @​shiv19, @​stephenwade, @​tranhl, @​waldyrious for improving Git Town through 39 shipped PRs and 13 resolved issues!

New Features
  • Git Town's append, hack, prepend, and propose commands now have a --detached flag that prevents them from pulling in additional changes from the main branch. This together with the existing --detached flag for git town sync allows controlling exactly when changes from the main branch get synced into your branch hierarchy (#​4095).
  • New config settings contribution-regex and observed-regex allow marking branches created by external services like Renovate or Dependabot appropriately (#​3985).
  • Git Town is now much more resilient against unexpected Git failures, for example when another Git process is running concurrently, because most Git Town operations are now fully reentrant (#​4082).
  • git town sync now syncs branches whose ancestors aren't available locally better: It pulls the tracking branches of all non-local ancestors until it finds a local ancestor (#​3769).
Bug Fixes
  • git town hack no longer panics if the main branch isn't available locally (#​3703).
  • git town hack no longer panics when the Git repo has a detached HEAD (#​3694).
  • Git Town now loads all applicable settings from the config file (#​4072).

v16.3.0

Compare Source

Git Town 16.3 is packed with some long-requested features we've been working towards for years!

Big shoutout to @​LogvinovLeon, @​alexw10, @​charlierudolph, @​cjol, @​ericcao52, @​kevgo, @​mw00120, @​ruudk, @​stephenwade, @​tranhl, @​waldyrious, @​zodman for your insightful contributions, feedback, and ideas. Git Town is a much better product thanks to you and the 52 shipped PRs and 6 resolved issues in this release!

New Features
  • Full integration of proposals (#​2745):
    • Git Town now updates all affected pull requests when you rename, prepend, or remove a branch or change its parent.
    • If the parent of a branch is unknown but there's an open PR, Git Town will now grab the PR’s base branch as the parent.
    • git town undo now also reverts any changes made to pull requests (#​4049).
  • Full integration with the Bitbucket Cloud API (#​973) and the gitea API (#​4044).
  • git town rename-branch now maintains the Git configuration and reflog for renamed branches (#​4023).
  • Git Town now logs all API interactions in the CLI, showing details like PR numbers and branch names it retrieves from the APIs. This makes it easier to see where information and possible slowness come from (#​4020, #​4026).

v16.2.1

Compare Source

Thanks to @​kevgo, @​ruudk, @​stephenwade, @​zodman for reporting and fixing unintuitive behavior that can and should be improved, leading to 13 shipped PRs and 2 resolved issues!

Bug Fixes
  • git town switch no longer asks for the ancestry of unrelated branches (#​4004).
  • git town branch no longer prints a redundant newline (#​4011).

v16.2.0

Compare Source

Git Town 16.2 makes it easier for you to manage the branches in your local repository.

Big thanks to @​kevgo, @​ruudk, @​stephenwade, @​zodman for coming up with the ideas for these new features and helping polish them in 38 shipped PRs and 6 resolved issues!

New Features
Bug Fixes
  • git town switch now exits with a nice error message if there are no branches to switch to (#​3979)
  • logs of API calls are now capitalized (#​3975)

v16.1.1

Compare Source

Git Town 16.1.1 ships important bug fixes for the new features introduced in v16.1.

Thanks to @​kevgo, @​rbardini, @​stephenwade!

Bug Fixes
  • The setup assistant now always stores default-branch-type and feature-regex in the Git-based configuration, not in the config file. These settings are typically developer-specific. You can still manually add them to the config file if needed (#​3961).
  • Fixes various documentation errors (#​3953).

v16.1.0

Compare Source

Git Town 16.1 provides multiple killer features for power users.

Big thanks to @​FFdhorkin, @​breml, @​bryanlarsen, @​buscape, @​enigma, @​heyitsaamir, @​kevgo, @​rbardini, @​ruudk, @​stephenwade, @​tranhl, @​zeronacer for contributing really good ideas, feedback, and code to 39 shipped PRs and 9 resolved issues!

New Features
  • Automatic branch detection: Git Town can now automatically detect feature and contribution or observed branches if you configure the new default-branch-type and feature-regex options (#​3683).
  • Detached syncing: Use git sync --detached to sync without pulling updates from the main branch. This helps keep development momentum if the main branch receives frequent updates and these updates trigger costly follow-up activities like npm install or long-running recompiles (more info, #​2657).
  • More concise branch switching: Running git town switch --type=<branch types> displays only branches of the given type (more info, #​3933).
Bug Fixes
  • Git Town no longer errors if the previously checked out Git branch is active in another worktree (#​3916).

v16.0.0

Compare Source

Git Town 16 brings the "git ship" command back in a big way 🚢 - Git Town now supports shipping stacked changes without merge conflicts - even on platforms that don't support it natively, like GitHub!

Big thanks to @​FFdhorkin, @​antoineMoPa, @​breml, @​bryanlarsen, @​buscape, @​kevgo, @​tranhl, @​zeronacer for the great feedback that led to this awesome new solution! This releaese contains 9 shipped PRs and 7 resolved issues.

BREAKING CHANGES

The default behavior of git ship tightens. Previously it shipped via the API if an API key is configured, and without an API key it did a local squash-merge. The new default behavior is to ship only via API or not at all. The new default behavior is safer because it only automates what the user would normally do online. You can specify a different behavior for git ship via the new ship-strategy configuration option (see below).

New Features
  • You can now configure how Git Town ships branches via the new ship-strategy configuration setting. Possible options are:
    • api ships the branch by merging its proposal via the API of your code hosting platform.
    • fast-forward is a new shipping strategy that prevents the false merge conflicts you get when shipping a branch from a stack using squashes or merges. It merges the branch to ship via git merge --ff-only into its parent (typically the main branch) on your local machine and then pushes the new commits to the remote main branch.
    • squash-merge as before merges the branch to ship via git merge --squash into its parent.

v15.3.0

Compare Source

15.3.0 (2024-08-26)

Git Town 15.3 brings sweet quality-of-life improvements.

Massive thanks to @​ChiefMateStarbuck, @​IvanVas, @​WhosNickDoglio, @​alphatroya, @​charlierudolph, @​cirego, @​erik-rw, @​gstamp, @​guusw, @​kelbyers, @​kevgo, @​marcelpanse, @​nishchay-manwani-glean, @​rnystrom, @​ruigomeseu, @​sergej-koscejev for helping evolve Git Town with useful feedback, ideas, and code contributions to 21 shipped PRs and 14 resolved issues!

New Features
  • Automatic retry for concurrent Git access: Git Town now waits and retries Git operations if another Git process is running concurrently. Super handy when your IDEs is running Git commands in the background (#​3629).
  • Shell prompt status indicator: If a Git Town command gets interrupted by a merge conflict, you can now add the name of the pending Git Town command to your shell prompt. This reminds you to run git town continue to finish the job (#​2208).
  • git town propose now takes you directly to the existing proposal's webpage if one already exists (#​2362).
  • API activity logs. Git Town now logs its communication with hosting APIs in the CLI output. This shows you what Git Town is doing and where slowness is coming from (#​3892).
  • git town kill no longer asks for the ancestry of branches it is about to delete as long as these branches don't have descendents (#​3870).
  • Setting up shell autocompletion on ZSH is now better documented (#​3889).
Bug Fixes
  • If you have a merge conflict between your uncommitted changes and branch ancestry, Git Town commands will fail when running git stash pop at the end. Previously when running git town continue it tried to pop the stash again, causing the same merge conflict to happen again. Now Git Town assumes you have resolved the merge conflicts when running git town continue and deletes the stash entry. If you need to re-apply the conflicting stash entry, run git stash pop manually before running git town continue. This keeps your Git stash clean (#​3886).
  • git town continue now re-runs all failed Git operations, helping recover from a wider range of unexpected issues (#​3887, #​3885).

v15.2.0

Compare Source

Big thanks to @​kevgo, @​mball-agathos, @​ruudk, @​sergej-koscejev for contributing super useful feedback, ideas, and code to 32 shipped PRs and 5 resolved issues!

New Features
  • The new "compress" sync strategy always compresses branches while syncing them (#​3320).
  • Basic support for integrating Git Town into lazygit (#​3872).
Bug Fixes
  • Renaming branches now keeps their contribution, observed, parked, and prototype status (#​3864).
  • The commands git town contribute, observe, park, and prototype now behave more correct and consistent (#​3880).

v15.1.0

Compare Source

Numerous thanks to @​FirelightFlagboy, @​Iron-Ham, @​IvanVas, @​JaredSharplin, @​JustinBis, @​TheHolyWaffle, @​WhosNickDoglio, @​alexus37, @​alphatroya, @​anikrajc, @​blaggacao, @​charlierudolph, @​cjol, @​connected-rmcleod, @​cridasilva, @​defunctzombie, @​erik-rw, @​kevgo, @​pattiereaves, @​sgarfinkel, @​stephenwade, @​teumas, @​zodman for the super useful feedback, ideas, and code contributions to 31 shipped PRs and 19 resolved issues.

New Features
  • git repo can now take the name of a remote to open the repo at that remote (#​1204).
  • The new sync-tags config option disables syncing of Git tags (#​3212).
  • git ship can now ship into any type of parent branch with the --to-parent option (#​2605).
  • git sync --stack syncs all branches in the current stack (#​3816).

v15.0.0

Compare Source

Git Town 15.0 improves Git Town's compatibility with monorepos and removes technical drift.

Major thanks to @​ianjsikes, @​kevgo, @​ruudk, @​seadowg, @​stephenwade, @​zodman for contributing valuable feedback, ideas, and code to 41 shipped PRs and 8 resolved issues!

BREAKING CHANGES
  • git town ship no longer syncs branches when shipping. From now on it only ships branches that are in sync. This ensures that only fully tested and reviewed changes get shipped (#​3350).
  • This also makes the sync-before-ship config option obsolete, it no longer exists (#​3644).
  • git town prepend no longer syncs when uncommitted changes are present. This allows committing your uncommitted changes first, then syncing later (#​3778).
  • The term main development branch gets shortened to main branch since there are no other development branches in Git Town's domain model (#​3643).
New Features
  • A new branch type called prototype branches syncs only locally, i.e. they don't create or push to a tracking branch until they are proposed. This helps reduce stress on the CI server, allows developers to prototype using sensitive information or potentially problematic code or data that they don't want to share (#​3646).
  • The new sync-prototype-strategy setting allows defining a dedicated sync strategy for prototype branches. This allows rebasing your commits while they are local, and switching to merging once other developers can see them (#​3785).
  • The new create-prototype-branches setting makes Git Town always create prototype branches (#​3779).

Configuration

📅 Schedule: Branch creation - "after 10pm on monday,before 3am on monday" in timezone America/Chicago, Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

♻ Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.

This PR was generated by Mend Renovate. View the repository job log.

@renovate renovate bot enabled auto-merge (squash) January 16, 2025 21:54
@renovate renovate bot merged commit 3c14d83 into main Jan 16, 2025
13 of 14 checks passed
@renovate renovate bot deleted the renovate/major-aqua-major branch January 16, 2025 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@renovate-approve renovate-approve[bot] renovate-approve[bot] approved these changes

Assignees
No one assigned
Labels
dependencies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
0 participants