Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1552 from trufflesuite/develop
Browse files Browse the repository at this point in the history
Release v7.0.0-alpha.2
  • Loading branch information
davidmurdoch authored Nov 12, 2021
2 parents 448e1fa + 956df4a commit 3ee3db3
Show file tree
Hide file tree
Showing 131 changed files with 37,511 additions and 35,611 deletions.
33 changes: 3 additions & 30 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# We start at Node 10.18.0 because it is the first version filecoin's
# CBOR package will let us install. Once filecoin is moved out of the
# monorepo we want to use 10.7.0 (earliest version the Ethereum side
# supports) or 10.13.0 (first node 10 LTS version).
node: [10.18.0, 10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
node: [12.0.0, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
os: [windows-2019, ubuntu-18.04, ubuntu-20.04, macos-11.0]

runs-on: ${{ matrix.os }}
Expand All @@ -29,38 +25,15 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}

- name: Add msbuild to PATH
# we need msbuild tools for the `bigint-buffer` module
# we need msbuild tools for the `bcrypto` module
if: startsWith(matrix.os, 'windows-')
uses: microsoft/[email protected]

- name: install node tools
# we don't need to install the windows-build-tools package, as we
# already have almost everything we need. We only need to install
# python 2.7. Also windows-build-tools@4 fails to install because some
# resources it downloads no longer exist, and windows-build-tools@5
# fails to install Python (it will wait on the python installer forever)
if: startsWith(matrix.os, 'windows-')
uses: actions/setup-python@v2
with:
python-version: "2.7"

- name: install node-gyp
if: startsWith(matrix.os, 'windows-')
run: npm install --global [email protected]

- name: Set node config to use python2.7
if: startsWith(matrix.os, 'windows-')
run: npm config set python python2.7

- name: Set node config to set msvs_version to 2019
if: startsWith(matrix.os, 'windows-')
run: npm config set msvs_version 2019 --global

- run: npm ci
- run: npm run tsc
- run: npm test
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# We start at Node 10.18.0 because it is the first version filecoin's
# CBOR package will let us install. Once filecoin is moved out of the
# monorepo we want to use 10.7.0 (earliest version the Ethereum side
# supports) or 10.13.0 (first node 10 LTS version).
node: [10.18.0, 10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x]
node: [12.0.0, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x]
os: [ubuntu-20.04]

runs-on: ${{ matrix.os }}
Expand Down
39 changes: 35 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16

- name: Set git identity
run: |
git config --global user.name 'Ganache Bot'
git config --global user.email 'david+ganache-test-bot@trufflesuite.com'
git remote set-url origin https://ganache-bot:${GITHUB_TOKEN}@github.com/$GITHUB_REPOSITORY
git config --global user.name 'Robot'
git config --global user.email 'robot@trufflesuite.com'
git remote set-url origin https://robot:${GITHUB_TOKEN}@github.com/$GITHUB_REPOSITORY
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -77,3 +77,34 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# publish to docker and github packages
- name: Log in to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: |
trufflesuite/ganache
ghcr.io/${{ github.repository}}
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
file: ./src/packages/ganache/Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.13.0
v12.0.0
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## Getting set up

- Use Node.js v10.13.0.
- Why v10.13.0? Because this is the first version prettier supports.
- Use Node.js v12.0.0.
- Why v12.0.0? Because this is the first LTS release of Node.js v12 and is the earliest version Ganache supports.
- recommendation: use [nvm](https://github.com/nvm-sh/nvm) on Linux and macOS, and [nvm-windows](https://github.com/coreybutler/nvm-windows) on
Windows, to configure your node version.
- On Linux and macOS, if you have `nvm` installed, just run `nvm use` to switch to Node.js v10.13.0.
- On Linux and macOS, if you have `nvm` installed, just run `nvm use` to switch to Node.js v12.0.0.
- `git clone [email protected]:trufflesuite/ganache.git`
- `cd ganache`
- `npm install` (use npm v6)
Expand Down Expand Up @@ -153,7 +153,7 @@ index 2a2aa9e..57cbf21 100644

These are guidelines, not rules. :-)

- Use Node.js v10.13.0 for most local development.
- Use Node.js v12.0.0 for most local development.
- Use `bigint` literals, e.g., `123n`; if the number is externally configurable and/or could exceed
`Number.MAX_SAFE_INTEGER`.
- Write tests.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 3ee3db3

Please sign in to comment.