Skip to content

Commit

Permalink
Merge pull request #2706 from oasislabs/pro-wh/junk/test
Browse files Browse the repository at this point in the history
readme: avoid tricky parsing of hard wrapped link
  • Loading branch information
pro-wh authored Feb 26, 2020
2 parents 5037df1 + 789933f commit b946fcc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .changelog/2706.trivial.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
readme: Avoid tricky parsing of hard wrapped link
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ lint-targets := lint-go lint-git lint-md lint-changelog
lint-go:
@$(MAKE) -C go lint

# NOTE: gitlint internally uses git rev-list, where A..B is asymmetric difference, which is kind of the opposite of
# how git diff interprets A..B vs A...B.
lint-git: fetch-git
@COMMIT_SHA=`git rev-parse $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH)` && \
echo "Running gitlint for commits from $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH) ($${COMMIT_SHA:0:7})..."; \
gitlint --commits $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH)...HEAD
gitlint --commits $(OASIS_CORE_GIT_ORIGIN_REMOTE)/$(RELEASE_BRANCH)..HEAD

lint-md:
@npx markdownlint-cli '**/*.md' --ignore .changelog/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Prerequisites:

* Linux (if you are not on Linux, you will need to either set up a VM with the
proper environment or, if Docker is available for your platform, use the
provided Docker image which does this for you, [see below](
#using-the-development-docker-image)).
provided Docker image which does this for you,
[see below](#using-the-development-docker-image)).

* System packages:
* [Bubblewrap](https://github.com/projectatomic/bubblewrap) (at least version
Expand Down

0 comments on commit b946fcc

Please sign in to comment.