Skip to content

Commit

Permalink
Merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
DimaStebaev committed Jan 11, 2024
2 parents c4f81e6 + 5820389 commit 4b85ada
Show file tree
Hide file tree
Showing 73 changed files with 3,362 additions and 2,907 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ on:
schedule:
- cron: '14 3 * * *'
env:
NODE_VERSION: 16
NODE_VERSION: 18
PYTHON_VERSION: 3.9

jobs:
jobs:
nightly-build-gas-without-node-rotation:
runs-on: ubuntu-latest

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
tags:
- 'custom-release-*'

env:
NODE_VERSION: 18

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -31,15 +34,15 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install NODE JS
uses: actions/setup-node@v2
with:
node-version: 16
node-version: ${{ env.NODE_VERSION }}

- name: Install project
run: yarn install

- name: Build and publish container
run: |
export BRANCH=${GITHUB_REF##*/}
Expand All @@ -50,7 +53,7 @@ jobs:
( test $BRANCH = "stable" || test $BRANCH = "master" && export PRERELEASE=false ) || export PRERELEASE=true
echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
bash ./scripts/build_and_publish.sh
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ on:
branches-ignore:
- 'docs-*'

env:
PYTHON_VERSION: 3.9

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [16.x, 18.x, 20.x]

env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down Expand Up @@ -49,7 +52,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: ${{ env.PYTHON_VERSION }}

- name: Install project
run: yarn install
Expand Down
30 changes: 17 additions & 13 deletions .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,29 @@
"extends": "solhint:all",
"rules": {
"not-rely-on-time": "off",
"mark-callable-contracts": "off",
"reason-string": "off",

"compiler-version": ["error","0.8.17"],
"state-visibility": "error",
"no-empty-blocks": "error",
"avoid-tx-origin": "error",
"check-send-result": "error",
"private-vars-leading-underscore": "error",
"code-complexity": "error",
"visibility-modifier-order": "error",
"compiler-version": ["error","0.8.17"],
"comprehensive-interface": "error",
"contract-name-camelcase": "error",
"explicit-types": "error",
"func-name-mixedcase": "error",
"func-named-parameters": "error",
"func-visibility": ["error", {"ignoreConstructors": true}],
"function-max-lines": "error",
"no-unused-vars": "error",
"max-states-count": ["error", 20],
"named-return-values": "error",
"no-empty-blocks": "error",
"no-global-import": "error",
"no-inline-assembly": "error",
"contract-name-camelcase": "error",
"no-unused-import": "error",
"no-unused-vars": "error",
"one-contract-per-file": "error",
"ordering": "error",
"avoid-tx-origin": "error",
"max-states-count": ["error",20],
"func-visibility": ["error",{"ignoreConstructors":true}],
"comprehensive-interface": "error"
"private-vars-leading-underscore": "error",
"state-visibility": "error",
"visibility-modifier-order": "error"
}
}
Loading

0 comments on commit 4b85ada

Please sign in to comment.