Skip to content

Commit

Permalink
Merge pull request #998 from Kwenta/dev
Browse files Browse the repository at this point in the history
Maintenance/Hotfix Release
  • Loading branch information
platschi authored Jun 13, 2022
2 parents 8a8dde7 + c7a87f7 commit 02ab937
Show file tree
Hide file tree
Showing 9 changed files with 644 additions and 687 deletions.
18 changes: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
open-pull-requests-limit: 3
target-branch: "dev"
schedule:
interval: "daily"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 3
target-branch: "dev"
labels:
- "npm"
- "dependencies"
20 changes: 10 additions & 10 deletions .github/workflows/audit_build_verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Kwenta CI
on:
push:
pull_request:
branches: [master, dev, v2, v2-dev]
branches: [main, dev]

jobs:
audit:
# run only on master/dev/v2/v2-dev branch and pull requests
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/v2-dev'
# run only on main/dev branch and pull requests
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
runs-on: ubuntu-latest

container:
Expand Down Expand Up @@ -63,21 +63,21 @@ jobs:
npm install --prefer-offline --no-audit --legacy-peer-deps
- name: Lint
# run only on master/dev/v2/v2-dev branch and pull requests
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/v2-dev'
# run only on main/dev branch and pull requests
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
run: npm run lint:sarif

- name: Upload lint results
# run if lint failed and only on master/dev/v2/v2-dev branch and pull requests
if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/v2-dev')
# run if lint failed and only on main/dev branch and pull requests
if: always() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
uses: github/codeql-action/upload-sarif@27ea8f8fe5977c00f5b37e076ab846c5bd783b96 # pin@codeql-bundle-20220322
with:
sarif_file: lint-results.sarif
continue-on-error: true

- name: Unit tests
# run only on master/dev/v2/v2-dev branch and pull requests
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/v2-dev'
# run only on main/dev branch and pull requests
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
run: npm run test:unit

build:
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
run: tar -zcvf build.tar.gz .next

- name: Archive build
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/v2-dev'
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # pin@v3
with:
name: build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: CodeQL

on:
push:
branches: [master, dev, v2, v2-dev]
branches: [main, dev]
paths-ignore:
- node_modules
pull_request:
branches: [master, dev, v2, v2-dev]
branches: [main, dev]
paths-ignore:
- node_modules
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/updateDependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: actions/setup-node@v3
with:
node-version: '14.17.1'
node-version: '16.15.1'
- name: npm update
run: npm install -g npm@7.19.0
run: npm install -g npm@8.11.0
- name: Update @synthetixio/contracts-interface dependency
run: |
npm install --legacy-peer-deps --no-audit
Expand Down
Loading

1 comment on commit 02ab937

@vercel
Copy link

@vercel vercel bot commented on 02ab937 Jun 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

kwenta – ./

kwenta-git-main-kwenta.vercel.app
kwenta-kwenta.vercel.app
kwenta.io
v2.beta.kwenta.io

Please sign in to comment.