Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

promote dev to master #482

Merged
merged 26 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'

- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'
open-pull-requests-limit: 5
target-branch: "dev"
target-branch: 'dev'
allow:
- dependency-name: "cypress"
dependency-type: "production"
- dependency-name: "synthetix-*"
dependency-type: "production"
- dependency-name: "@synthetixio/*"
dependency-type: "production"
- dependency-name: 'cypress'
dependency-type: 'production'
- dependency-name: 'synthetix-*'
dependency-type: 'production'
- dependency-name: '@synthetixio/*'
dependency-type: 'production'
labels:
- "npm"
- "dependencies"
- 'npm'
- 'dependencies'
pull-request-branch-name:
separator: "-"
separator: '-'
37 changes: 23 additions & 14 deletions .github/workflows/audit_and_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ on:
pull_request:
branches: [master, dev]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

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

container:
image: ghcr.io/synthetixio/docker-sec-tools/alpine:16.14
credentials:
username: synthetixio
password: ${{ secrets.GH_PACKAGES_READ_ONLY }}
image: synthetixio/docker-sec-tools:16.14-alpine

steps:
- name: Checkout
Expand All @@ -25,19 +28,21 @@ jobs:
run: npm audit --audit-level=critical

- name: Lockfile lint
run: lockfile-lint -p package-lock.json --type npm --allowed-hosts npm github.com --allowed-schemes "https:" "git+ssh:" --empty-hostname false
run:
lockfile-lint -p package-lock.json --type npm --allowed-hosts npm
github.com --allowed-schemes "https:" "git+ssh:" --empty-hostname
false

build:
needs: audit
# run only on audit success or audit skipped
if: always() && (needs.audit.result == 'success' || needs.audit.result == 'skipped')
if:
always() && (needs.audit.result == 'success' || needs.audit.result ==
'skipped')
runs-on: ubuntu-latest

container:
image: ghcr.io/synthetixio/docker-node/alpine:16.14
credentials:
username: synthetixio
password: ${{ secrets.GH_PACKAGES_READ_ONLY }}
image: synthetixio/docker-node:16.14-alpine

steps:
- name: Checkout
Expand Down Expand Up @@ -66,13 +71,17 @@ jobs:

- name: Lint
# run only on master/dev branch and pull requests
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
if:
github.ref == 'refs/heads/master' || 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 branch and pull requests
if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725 # pin@codeql-bundle-20210517
if:
always() && (github.ref == 'refs/heads/master' || github.ref ==
'refs/heads/dev' || github.event_name == 'pull_request')
uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # pin@codeql-bundle-20210517
with:
sarif_file: lint-results.sarif
continue-on-error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2

- name: Initialize CodeQL
uses: github/codeql-action/init@c7f292ea4f542c473194b33813ccd4c207a6c725
uses: github/codeql-action/init@b398f525a5587552e573b247ac661067fafa920b
with:
queries: security-and-quality
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@c7f292ea4f542c473194b33813ccd4c207a6c725
uses: github/codeql-action/analyze@b398f525a5587552e573b247ac661067fafa920b
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ jobs:
path: |
.npm-cache
node_modules
key: ${{ runner.os }}-ubuntu-node-16-${{ hashFiles('**/package-lock.json') }}
key:
${{ runner.os }}-ubuntu-node-16-${{
hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-ubuntu-node-16-
continue-on-error: true
Expand Down
10 changes: 10 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Autoformatter friendly markdownlint config (all formatting rules disabled)
default: true
blank_lines: false
bullet: false
html: false
indentation: false
line_length: false
spaces: false
url: false
whitespace: false
8 changes: 0 additions & 8 deletions .prettierrc.js

This file was deleted.

7 changes: 7 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
semi: true
trailingComma: all
singleQuote: true
printWidth: 80
tabWidth: 2
arrowParens: avoid
proseWrap: always
4 changes: 4 additions & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*out
*logs
plugins
user_trunk.yaml
26 changes: 26 additions & 0 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: 0.1
cli:
version: 0.16.1-beta
sha256:
darwin_arm64: 3fb733a9907ec366d86d06313d1b0c956a0f9e86cdbaeaaa72ecf29fb9de17a7
darwin_x86_64: d15589aaf2128d4a732f96f101ccfad433532d2027a9b809c74169371c7e270e
linux_x86_64: 87245d043c5f0c9bf5b21ff66a43df715f459068bd2e47964c7d517cca074007
lint:
enabled:
- [email protected]
- [email protected]
- git-diff-check@SYSTEM
- [email protected]
- [email protected]
- [email protected]
ignore:
- linters: [ALL]
paths:
- node_modules/**
- tests/test-dapp
- downloads
- tests/e2e/videos
- tests/e2e/screenshots
threshold:
- linters: [ALL]
level: high
Loading