Merge release 1.2.4 into 1.3.x #56
Merged
Conversation
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Updates the CHANGELOG.md file to add a changelog entry for a new 1.2.1 version.
Updates the CHANGELOG.md file to add a changelog entry for a new 1.2.2 version.
Updates the CHANGELOG.md file to add a changelog entry for a new 1.2.3 version.
Updates the CHANGELOG.md file to add a changelog entry for a new 1.2.4 version.
Adds an entry for #50 in the Fixed section, and sets the release date. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
Signed-off-by: Matthew Weier O'Phinney <[email protected]>
…a given branch Signed-off-by: Matthew Weier O'Phinney <[email protected]>
…mote origin
As it turns out, while you can use `git show {ref}:{filename}` to both
test for the existing of a file at a given reference, as well as display
its contents, it only works if the reference is present.
When the github action starts, it _exports_ the default branch to the
working directory. Our code then _fetches_ from the remote, which then
sets the current branch to the _default_ branch, which may or may not be
the branch we are releasing from. It's not until we do a checkout
operation that the release branch can be guaranteed as a reference in
the checkout.
The reference _does_ exist in the `origin` remote, and since we have all
history, that means the content is present in our checkout; it's just
that the reference doesn't exist **IN** the checkout.
As such, for idempotent operations where we are checking for the
existence of a file, or pulling its contents, we need to qualify the
reference with the remote name (e.g., `{remote}/1.0.x`). Since we can
guarantee that the `origin` remote is present, we can use that remote
name.
Fiexes #51
Signed-off-by: Matthew Weier O'Phinney <[email protected]>
Updates CHANGELOG.md file with info on fix introduced in #55. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
weierophinney
force-pushed
the
1.2.x-merge-up-into-1.3.x_5f36987494def9.50179241
branch
from
06b2902 to
2ec766b
Compare
weierophinney
deleted the
1.2.x-merge-up-into-1.3.x_5f36987494def9.50179241
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release 1.2.4
1.2.4
Bug