-
Notifications
You must be signed in to change notification settings - Fork 107
contrib: add a wrapper to be able to check deploys use up-to-date git #198
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
Open
lf-
wants to merge
1
commit into
nix-community:main
Choose a base branch
from
lf-:jade/contrib-footgun-script
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # SPDX-License-Identifier: CC0-1.0 | ||
| # SPDX-FileCopyrightText: 2024 Jade Lovelace | ||
| # | ||
| # A wrapper for colmena that prevents accidentally deploying changes without | ||
| # having pulled. | ||
| { colmena, runCommandNoCC }: | ||
| runCommandNoCC "colmena-wrapper" | ||
| { | ||
| env = { | ||
| colmena = "${colmena}/bin/colmena"; | ||
| remote_name = "origin"; | ||
| upstream_branch = "main"; | ||
| }; | ||
| } '' | ||
| mkdir -p $out | ||
| ln -s ${colmena}/share $out/share | ||
| mkdir $out/bin | ||
|
|
||
| substituteAll ${./colmena-wrapper.sh.in} $out/bin/colmena | ||
| chmod +x $out/bin/colmena | ||
| '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #!/usr/bin/env bash | ||
| # SPDX-License-Identifier: CC0-1.0 | ||
| # SPDX-FileCopyrightText: 2024 Jade Lovelace | ||
|
|
||
| doChecks() { | ||
| # creates refs in the refs/prefetch/remotes/origin namespace | ||
| echo "Prefetching repo changes..." >&2 | ||
| git fetch --quiet --prefetch --no-write-fetch-head @remote_name@ | ||
|
|
||
| diffs=$(git rev-list --left-right --count HEAD...refs/prefetch/remotes/@remote_name@/@upstream_branch@) | ||
| only_in_local=$(echo "$diffs" | cut -f1) | ||
| only_in_main=$(echo "$diffs" | cut -f2) | ||
|
|
||
| if [[ $only_in_main -gt 0 && ! -v $FOOTGUN_ME_UWU ]]; then | ||
| echo >&2 | ||
| echo "Attempting to deploy when @upstream_branch@ has $only_in_main commits not in your branch!" >&2 | ||
| echo "This will probably revert someone's changes. Consider merging them." >&2 | ||
| echo "If you really mean it, set the environment variable FOOTGUN_ME_UWU" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ $only_in_local -gt 0 ]]; then | ||
| echo "You have $only_in_local commits not yet pushed to @upstream_branch@. Reminder to push them after :)" >&2 | ||
| fi | ||
| } | ||
|
|
||
| if [[ $1 == 'apply' ]]; then | ||
| doChecks | ||
| fi | ||
|
|
||
| exec @colmena@ "$@" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FOOTGUN_ME_UWU 🥺