Use a branch as an alias of the latest release #232
Merged
Conversation
This file contains 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
This is to make diffing master against whatever the latest released version of the package is. This allows us to easily see what has been committed to master but not yet released in a consistent way, eg with a diff like: latest-release...master This means we don't need to know the latest release is tag `v4.10.0` (for example) This also lets us track un-released package changes in tools like the deploy-lag-radiator (https://github.com/dsingleton/deploy-lag-radiator)
|
@dsingleton thanks, this is really useful! 💯 |
gemmaleigh
added a commit
that referenced
this pull request
May 25, 2016
# 1.2.0 - Add MIT License (PR #236) - Create latest release branch as an alias of the latest release (PR #232) - Create new app to preview govuk elements sass releases (PR #219) - Fix the summary arrow in recent Firefox (PR #227) - Remove button padding overriding the govuk_frontend_toolkit (PR #230) - Don't copy the govuk_frontend_toolkit's images into an icons folder (PR #223) - Fix path for rails and node environments (PR #234) - Import the govuk_frontend_toolkit url-helpers partial - If image-url is not defined (if we are not in a Rails environment), then set a path to /public/images
gemmaleigh
added a commit
that referenced
this pull request
May 25, 2016
# 1.2.0 - Add MIT License (PR #236) - Create latest release branch as an alias of the latest release (PR #232) - Create new app to preview govuk elements sass releases (PR #219) - Fix the summary arrow in recent Firefox (PR #227) - Remove button padding overriding the govuk_frontend_toolkit (PR #230) - Don't copy the govuk_frontend_toolkit's images into an icons folder (PR #223) - Fix path for rails and node environments (PR #234) - Import the govuk_frontend_toolkit url-helpers partial - If image-url is not defined (if we are not in a Rails environment), then set a path to /public/images
robinwhittleton
pushed a commit
that referenced
this pull request
May 26, 2016
# 1.2.0 - Add MIT License (PR #236) - Create latest release branch as an alias of the latest release (PR #232) - Create new app to preview govuk elements sass releases (PR #219) - Fix the summary arrow in recent Firefox (PR #227) - Remove button padding overriding the govuk_frontend_toolkit (PR #230) - Don't copy the govuk_frontend_toolkit's images into an icons folder (PR #223) - Fix path for rails and node environments (PR #234) - Import the govuk_frontend_toolkit url-helpers partial - If image-url is not defined (if we are not in a Rails environment), then set a path to /public/images - Fix the skip link in Safari (PR #225)
Merged
dsingleton
added a commit
that referenced
this pull request
Aug 5, 2016
Added in #232 The push failed in the most recent release/build: ``` To [email protected]:alphagov/govuk_elements.git ! [rejected] master -> latest-release (non-fast-forward) error: failed to push some refs to '[email protected]:alphagov/govuk_elements.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. ``` Given it's just for tracking, we can safely force push.
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.
This is to make diffing master against whatever the latest released version
of the package is. This allows us to easily see what has been committed to
master but not yet released in a consistent way, eg with a diff like:
latest-release...master
This means we don't need to know the latest release is tag
v4.10.0(for example)This also lets us track un-released package changes in tools like the deploy-lag-radiator
(https://github.com/dsingleton/deploy-lag-radiator)