Skip to content

Commit

Permalink
Merge pull request #778 from Conflux-Chain/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
yqrashawn authored Feb 24, 2022
2 parents 2eb7a4b + 0ebf356 commit 7f4ebcd
Show file tree
Hide file tree
Showing 241 changed files with 7,208 additions and 2,019 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# shared basic environment variable
# the build tool will load this file with any NODE_ENV
SNOWPACK_PUBLIC_FLUENT_VERSION=1.3.1
SNOWPACK_PUBLIC_FLUENT_VERSION=1.4.0
2 changes: 1 addition & 1 deletion .github/release-drafter-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ autolabeler:
- '/BREAKING\sCHANGE/'

replacers:
- search: '/\* chore\(release-pkg\): release packages.*$/'
- search: '/\* chore\(common\): release packages.*$/'
replace: ""

template: |
Expand Down
2 changes: 2 additions & 0 deletions .github/release-drafter-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ replacers:
replace: ""
- search: '/\*\sdoc.*$/'
replace: ""
- search: '/\* chore\(common\): release packages.*$/'
replace: ""

template: |
## What’s Changed
Expand Down
2 changes: 1 addition & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ autolabeler:
- '/BREAKING\sCHANGE/'

replacers:
- search: '/\* chore\(release-pkg\): release packages.*$/'
- search: '/\* chore\(common\): release packages.*$/'
replace: ""

template: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- run: rm -rf .yarn/versions || true
- env:
YARN_NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
run: yarn workspaces changed foreach --topological --no-private --verbose --parallel --interlaced npm publish --access public --tolerate-republish || true
run: ./scripts/any-packages-version-changed.sh && yarn workspaces foreach --topological --no-private --verbose --parallel --interlaced npm publish --access public --tolerate-republish || true
- run: git add .
- run: |
git -c user.name='ConfluxBot' \
Expand Down
55 changes: 27 additions & 28 deletions .github/workflows/push-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,31 +165,30 @@ jobs:
${{ runner.os }}-yarn-and-maven-
- run: yarn install --immutable
- run: yarn workspace doc build

build-storybook:
if: ${{ github.ref != 'refs/heads/__release-pkg'}}
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.5]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
- uses: actions/cache@v2
id: yarn-and-maven-cache # use this to check for `cache-hit` (`steps.yarn-and-maven-cache.outputs.cache-hit != 'true'`)
with:
path: |
~/.m2/repository
${{ steps.yarn-cache-dir-path.outputs.dir }}
./.shadow-cljs
key: ${{ runner.os }}-yarn-and-maven-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('./shadow-cljs.edn') }}
restore-keys: |
${{ runner.os }}-yarn-and-maven-
- run: yarn install --immutable
- run: yarn build-storybook
# build-storybook:
# if: ${{ github.ref != 'refs/heads/__release-pkg'}}
# runs-on: ubuntu-20.04
# strategy:
# matrix:
# node-version: [16.5]
# steps:
# - uses: actions/checkout@v2
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v2
# with:
# node-version: ${{ matrix.node-version }}
# - name: Get yarn cache directory path
# id: yarn-cache-dir-path
# run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
# - uses: actions/cache@v2
# id: yarn-and-maven-cache # use this to check for `cache-hit` (`steps.yarn-and-maven-cache.outputs.cache-hit != 'true'`)
# with:
# path: |
# ~/.m2/repository
# ${{ steps.yarn-cache-dir-path.outputs.dir }}
# ./.shadow-cljs
# key: ${{ runner.os }}-yarn-and-maven-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('./shadow-cljs.edn') }}
# restore-keys: |
# ${{ runner.os }}-yarn-and-maven-
# - run: yarn install --immutable
# - run: yarn build-storybook
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,7 @@ cljs-runtime
/packages/background/src/local-dev.js
/blockchain_data/
/pos_config/

/resources/*
!/resources/firefox-debug-profile
/.nrepl-port
8 changes: 0 additions & 8 deletions .yarn/versions/2231a8d3.yml

This file was deleted.

13 changes: 13 additions & 0 deletions bb.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{:paths ["scripts"]
:deps {medley/medley {:mvn/version "1.3.0"}}
:tasks
{nrepl {:doc "start bb nrepl"
:task x.nrepl/run}
shadow {:doc "start shadow-cljs repl"
:task x.shadow/run}
snowpack {:doc "start snowpack dev server"
:task (shell "yarn run dev")}

-start {:depends [nrepl shadow snowpack]}
start {:doc "start bb and cljs repl"
:task (run '-start {:parallel true})}}}
Loading

0 comments on commit 7f4ebcd

Please sign in to comment.