Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkernaghan authored May 6, 2021
2 parents 6a0e47b + 5e07466 commit 83304ab
Show file tree
Hide file tree
Showing 830 changed files with 105,337 additions and 49,171 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug
about: Create a bug report to help us improve
title: ''
labels: bug
assignees: ''

---

**Description**
A clear and concise description of what the bug is.

**Steps To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem and use case? Please describe.**
A clear and concise description of what the problem/use case is.
Ex. My application is... My goal was to get ....
The main workflow where this needed is....

**Describe the solution you'd like**
A clear and concise description of what you'd want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
Which solution worked? What didn't work?
Do you have a workaround currently? If yes, how does it work?

**Additional context**
Add any other context or screenshots about the feature request here.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/research-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Research&design
about: Suggest an idea for this project
title: 'SPIKE:'
labels: ''
assignees: ''

---

**What are the goals of the research?**
A clear and concise description of what are the main goals of the research.

**Describe the concrete outcomes of the research below. Can include questions/areas that need to be investigated/discussed**
**Acceptance criteria:**
- <Add A clear and concise list of items here>
- ...
- Document results of the research and suggest next steps

OUT OF SCOPE:
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/user-story.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: User story
about: 'USER STORY:'
title: 'USER STORY:'
labels: ''
assignees: ''

---

**As Taquito user, I want to <...>, so that <I can see or avoid this outcome>**

**Use cases:**

**Is this user story related to an existing problem? Please describe.**
A clear and concise description of what the problem is.

**Acceptance criteria:**
-
-
-
-
-

**Non-functional:**
- consider performance, scalability, security

OUT OF SCOPE:
N/A

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
analyse:
name: Analyse
runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- name: Checkout repository
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/deploy_edge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Deploy Edge

on:
pull_request:
push:
branches:
- master
jobs:
deply-edge-package:
runs-on: self-hosted
if: ${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/master' }}
strategy:
matrix:
node: [12.x]
env:
VERDACCIO_TOKEN: ${{ secrets.EDGE_VERDACCIO_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}
- uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
- run: echo "PACKAGE_VERSION=`node -p "require('./packages/taquito/package.json').version"`" >> $GITHUB_ENV
- run: echo "BRANCH_NAME=`echo $GITHUB_REF | cut -d'/' -f 3`" >> $GITHUB_ENV
- run: echo "TARGET_VERSION=${PACKAGE_VERSION}-${SHORT_SHA}--${BRANCH_NAME}" >> $GITHUB_ENV
- run: npm ci
- run: npm run lerna -- bootstrap
- run: find packages/ -mindepth 1 -maxdepth 2 -name README.md | xargs sed -i '1s/^/# WARNING This build is produced from a feature branch and could contain unreviewed changes from the public. Use with caution, do not use in production\n\n/'
- run: npm run lerna -- version "${TARGET_VERSION}" --no-push --no-git-tag-version --yes
- run: npm run build
- run: cd packages/taquito && npm run build:release && cd ../..
- run: git config user.email "[email protected]" && git config user.name "Github Actions"
- run: git add . && git commit -m "committing changes to files to make lerna happy in next step, this is expected to never be pushed to remote"
- run: echo ${VERDACCIO_TOKEN} >> ~/.npmrc
- run: npm run lerna -- publish --dist-tag edge from-package --yes --registry https://npm.preview.tezostaquito.io/
- run: |
echo "COMMENT_BODY<<EOF" >> $GITHUB_ENV
echo "New packages have been deployed to the preview repository at https://npm.preview.tezostaquito.io/." >> $GITHUB_ENV
echo "" >> $GITHUB_ENV
echo "### Published packages:" >> $GITHUB_ENV
echo "\`\`\`" >> $GITHUB_ENV
find packages/ -mindepth 1 -maxdepth 2 -name package.json | xargs -I{} node -pe "require('./{}')['name']" | sed "s/^\(.*\)$/npm i \1@${TARGET_VERSION} --registry https:\/\/npm.preview.tezostaquito.io\//" >> $GITHUB_ENV
echo "\`\`\`" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- uses: actions/github-script@v3
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: process.env.COMMENT_BODY
})
23 changes: 13 additions & 10 deletions .github/workflows/deploy_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- master
jobs:
publish-docs:
publish-website:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -18,17 +18,20 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm install
- run: npm ci
- run: npm run lerna -- bootstrap
- run: npm run lerna run build
- run: cd website && cp -R build/. ../dist
- run: npm run build-docs
- run: cd dist && touch .nojekyll && echo 'tezostaquito.io' > CNAME
- name: Publish generated content to GitHub Pages
uses: tsunematsu21/[email protected]
with:
dir: dist
branch: gh-pages
token: ${{ secrets.ACCESS_TOKEN }}
- run: npm run netlify:publish
env:
CI: true
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: Taquito Notifications
SLACK_ICON: https://imgur.com/1zlqzFu
SLACK_TITLE: Message
SLACK_MESSAGE: A new version of the Taquito website has been published. https://tezostaquito.netlify.app
38 changes: 27 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
name: Node.js CI

on: [push]
on:
pull_request:
push:
branches:
- master
jobs:
lint-and-test:
runs-on: ubuntu-latest
runs-on: self-hosted
strategy:
matrix:
node: [12.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: ${{ matrix.node }}
- uses: actions/cache@v1
with:
path: ~/.npm
Expand All @@ -19,18 +26,22 @@ jobs:
- run: npm run lerna -- bootstrap
- run: npm run build
- run: npm run lint
- run: npm run build-docs
- run: npm run test -- --runInBand
- uses: codecov/codecov-action@v1
with:
file: .coverage/*.json
env:
CI: true
RUN_INTEGRATION: true
integration-tests-carthagenet:
runs-on: ubuntu-latest
TEZOS_RPC_EDONET: ${{ secrets.TEZOS_RPC_EDONET }}
TEZOS_RPC_FLORENCENET: ${{ secrets.TEZOS_RPC_FLORENCENET }}

integration-tests-edonet:
runs-on: self-hosted
strategy:
matrix:
node: [10.x, 12.x]
node: [12.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand All @@ -45,14 +56,17 @@ jobs:
- run: npm ci
- run: npm run lerna -- bootstrap
- run: npm run build
- run: cd integration-tests && npm run test:carthagenet
- run: cd integration-tests && npm run test:edonet -- --maxWorkers=8
env:
CI: true
integration-tests-delphinet:
runs-on: ubuntu-latest
TEZOS_RPC_EDONET: ${{ secrets.TEZOS_RPC_EDONET }}
TEZOS_RPC_FLORENCENET: ${{ secrets.TEZOS_RPC_FLORENCENET }}

integration-tests-florencenet:
runs-on: self-hosted
strategy:
matrix:
node: [10.x, 12.x]
node: [12.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand All @@ -67,6 +81,8 @@ jobs:
- run: npm ci
- run: npm run lerna -- bootstrap
- run: npm run build
- run: cd integration-tests && npm run test:delphinet
- run: cd integration-tests && npm run test:florencenet -- --maxWorkers=8
env:
CI: true
TEZOS_RPC_EDONET: ${{ secrets.TEZOS_RPC_EDONET }}
TEZOS_RPC_FLORENCENET: ${{ secrets.TEZOS_RPC_FLORENCENET }}
50 changes: 50 additions & 0 deletions .github/workflows/preview_website.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Netlify Preview Deploy

on:
pull_request:
branches: [master]

jobs:
## This job will deploy the netlify preview builds
publish-website-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 10.x
- uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm ci
- run: npm run lerna -- bootstrap
- run: npm run lerna run build
- run: npm run build-docs
- run: echo "short_sha=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
- run: npm run netlify:preview
env:
CI: true
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
- uses: actions/github-script@v3
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: 'A new deploy preview is available on Netlify at https://${{ env.short_sha }}--tezostaquito.netlify.app'
})
- uses: actions/checkout@v2
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: Taquito Notifications
SLACK_ICON: https://imgur.com/1zlqzFu
SLACK_TITLE: Message
SLACK_MESSAGE: There is a new deployment preview available for Taquito at https://${{ env.short_sha }}--tezostaquito.netlify.app
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,20 @@ compiled
website/build/
manifest.json
!.vscode/extensions.json
website/*.bak
integration-tests/jest-stare
packages/taquito/src/version.ts
packages/taquito-beacon-wallet/src/version.ts
packages/taquito-http-utils/src/version.ts
packages/taquito-ledger-signer/src/version.ts
packages/taquito-local-forging/src/version.ts
packages/taquito-michel-codec/src/version.ts
packages/taquito-michelson-encoder/src/version.ts
packages/taquito-remote-signer/src/version.ts
packages/taquito-rpc/src/version.ts
packages/taquito-signer/src/version.ts
packages/taquito-tezbridge-signer/src/version.ts
packages/taquito-tezbridge-wallet/src/version.ts
packages/taquito-tzip12/src/version.ts
packages/taquito-tzip16/src/version.ts
packages/taquito-utils/src/version.ts
2 changes: 2 additions & 0 deletions @nodes/alltypes.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declare module 'rollup-plugin-json';
declare module 'lodash.camelcase';
Loading

0 comments on commit 83304ab

Please sign in to comment.