Skip to content

Commit

Permalink
Merge pull request #62 from Synthetixio/dev
Browse files Browse the repository at this point in the history
promote dev to master
  • Loading branch information
drptbl authored Apr 6, 2023
2 parents 206cad8 + 62f7c28 commit 403351e
Show file tree
Hide file tree
Showing 5 changed files with 862 additions and 741 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit_and_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

- name: Audit dependencies
run: audit-ci --critical --report-type full
Expand All @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

- name: Set yarn cache directory
run: yarn config set cache-folder .yarn-cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

- name: Initialize CodeQL
uses: github/codeql-action/init@16964e90ba004cdf0cd845b866b5df21038b7723
uses: github/codeql-action/init@04df1262e6247151b5ac09cd2c303ac36ad3f62b
with:
queries: security-and-quality
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@16964e90ba004cdf0cd845b866b5df21038b7723
uses: github/codeql-action/analyze@04df1262e6247151b5ac09cd2c303ac36ad3f62b
6 changes: 3 additions & 3 deletions .github/workflows/trunk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
with:
Expand All @@ -35,13 +35,13 @@ jobs:

- name: Lint (changes)
if: github.event_name == 'pull_request'
uses: trunk-io/trunk-action@b033203e937f42022e351f1313cf84123c4472df
uses: trunk-io/trunk-action@4f077db8a20117a021b787adbf62729ae143c19e
with:
trunk-token: ${{ secrets.TRUNK_TOKEN }}

- name: Lint (codebase)
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
uses: trunk-io/trunk-action@b033203e937f42022e351f1313cf84123c4472df
uses: trunk-io/trunk-action@4f077db8a20117a021b787adbf62729ae143c19e
with:
check-mode: all
trunk-token: ${{ secrets.TRUNK_TOKEN }}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"update:deps": "ncu -u && yarn"
},
"dependencies": {
"@aws-sdk/client-cloudwatch-logs": "3.264.0",
"@synthetixio/contracts-interface": "2.76.7",
"@aws-sdk/client-cloudwatch-logs": "3.306.0",
"@synthetixio/contracts-interface": "2.77.0",
"basic-auth": "2.0.1",
"bignumber.js": "9.1.1",
"cookie-parser": "1.4.6",
Expand All @@ -23,20 +23,20 @@
"express": "4.18.2",
"express-basic-auth": "1.2.1",
"morgan": "1.10.0",
"redis": "4.6.4",
"redis": "4.6.5",
"serve-favicon": "2.5.0",
"swagger-jsdoc": "6.2.8",
"swagger-ui-express": "4.6.0",
"swagger-ui-express": "4.6.2",
"winston": "3.8.2",
"winston-cloudwatch": "6.1.1"
},
"devDependencies": {
"@trunkio/launcher": "1.2.3",
"eslint": "8.33.0",
"eslint-config-prettier": "8.6.0",
"eslint": "8.37.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-prettier": "4.2.1",
"nodemon": "2.0.20",
"npm-check-updates": "16.6.4",
"prettier": "2.8.3"
"nodemon": "2.0.22",
"npm-check-updates": "16.10.7",
"prettier": "2.8.7"
}
}
Loading

0 comments on commit 403351e

Please sign in to comment.