Skip to content

Commit

Permalink
Merge pull request #313 from zer0-os/release/0.3.0
Browse files Browse the repository at this point in the history
Release/0.3.0
  • Loading branch information
dalefukami authored Jan 18, 2023
2 parents 207592a + c4a4347 commit b53fd63
Show file tree
Hide file tree
Showing 34 changed files with 768 additions and 400 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: Deploy Development
on:
push:
branches:
- main
- development
jobs:
test:
validate:
runs-on: ubuntu-latest
env:
REACT_APP_INFURA_URL: ${{secrets.INFURA_URL}}
Expand All @@ -15,9 +16,11 @@ jobs:
node-version: '16'
- run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
- run: npm install
- run: npm run lint
- run: npx tsc
- run: npm run test
deploy:
needs: test
needs: validate
runs-on: ubuntu-latest
environment: development
env:
Expand Down
17 changes: 3 additions & 14 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
name: Deploy Production
on:
push:
branches:
- main
release:
types:
- published
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
- run: npm install
- run: npm run test
deploy:
needs: test
runs-on: ubuntu-latest
environment: production
env:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/run-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: run-build
on:
pull_request: {}

jobs:
run-build:
runs-on: ubuntu-latest
env:
REACT_APP_INFURA_URL: ${{secrets.INFURA_URL}}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
- run: npm install
- name: Build project
run: npm run build
18 changes: 18 additions & 0 deletions .github/workflows/run-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: run-lint
on:
pull_request: {}

jobs:
run-lint:
runs-on: ubuntu-latest
env:
REACT_APP_INFURA_URL: ${{secrets.INFURA_URL}}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
- run: npm install
- name: Build project
run: npm run lint
16 changes: 16 additions & 0 deletions .github/workflows/run-typecheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: run-typecheck
on:
pull_request: {}

jobs:
run-typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
- run: npm install
- name: Build project
run: npx tsc
66 changes: 44 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zOS",
"version": "0.2.15",
"version": "0.3.0",
"private": true,
"main": "./public/electron.js",
"engines": {
Expand All @@ -23,8 +23,8 @@
"@web3-react/portis-connector": "^6.2.11",
"@web3-react/walletconnect-connector": "^6.2.13",
"@web3-react/walletlink-connector": "^6.2.13",
"@zer0-os/zos-component-library": "0.18.5",
"@zer0-os/zos-feed": "^1.30.0",
"@zer0-os/zos-component-library": "0.18.7",
"@zer0-os/zos-feed": "^1.29.2",
"@zer0-os/zos-zns": "2.3.3",
"@zero-tech/zapp-buy-domains": "^0.2.1",
"@zero-tech/zapp-daos": "^0.4.0",
Expand Down
4 changes: 4 additions & 0 deletions src/Main.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ import { AddressBarContainer } from './components/address-bar/container';
describe('Main', () => {
const subject = (props: Partial<Properties> = {}) => {
const allProps = {
isSidekickOpen: false,
hasContextPanel: false,
isContextPanelOpen: false,
context: {
isAuthenticated: false,
},
...props,
};

Expand Down
Loading

0 comments on commit b53fd63

Please sign in to comment.