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.

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

Release 3.0.1 #35

Merged
merged 28 commits into from
Dec 20, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove @blockone/ org prefix; update version to 3.0.1; clean up
  • Loading branch information
Julien Heller committed Dec 20, 2018
commit 66e1ebe82175bb3de88150340281e39ed843d53d
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ stages:
- name: publish-edge
if: (NOT type IN (pull_request)) AND (branch = develop)
- name: publish-latest
# Travis assigns the tag to branch for some reason. This matches any valid semver version.
if: branch =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$
jobs:
include:
Expand All @@ -18,8 +19,6 @@ jobs:
script:
- npm run lint
- npm run test
- echo $TRAVIS_BRANCH
- echo $TRAVIS_TAG
- stage: publish-edge
name: "Publish @edge to NPM"
script:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blockone/demux-eos",
"version": "3.0.2",
"name": "demux-eos",
"version": "3.0.1",
"description": "Demux-js Action Reader implementations for EOSIO blockchains",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
12 changes: 6 additions & 6 deletions scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ clean_git() {
}

check_head() {
echo " Checking if HEAD aligns with automate-publish..."
git fetch origin automate-publish:automate-publish
if ! [ "$(git rev-parse HEAD)" = "$(git show-ref refs/heads/automate-publish --hash)" ]; then
echo "✖ Current HEAD does not match head of automate-publish!"
echo " Checking if HEAD aligns with master..."
git fetch origin master:master
if ! [ "$(git rev-parse HEAD)" = "$(git show-ref refs/heads/master --hash)" ]; then
echo "✖ Current HEAD does not match head of master!"
echo " - HEAD: $(git rev-parse HEAD)"
echo " - automate-publish: $(git show-ref refs/heads/automate-publish --hash)"
echo " - master: $(git show-ref refs/heads/master --hash)"
return 1
fi
echo "✔ Current HEAD matches head of automate-publish"
echo "✔ Current HEAD matches head of master"
return 0
}

Expand Down