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 #531

Merged
merged 40 commits into from
Oct 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b2d6342
chore(deps): Bump github/codeql-action from 2.1.24 to 2.1.25
dependabot[bot] Sep 22, 2022
83925e6
Merge pull request #515 from Synthetixio/dependabot/github_actions/gi…
drptbl Sep 22, 2022
dd4e14a
Merge pull request #516 from Synthetixio/master
drptbl Sep 22, 2022
612f932
po: add popup background
drptbl Sep 26, 2022
dd13339
fix: close popup with click on background
drptbl Sep 26, 2022
263dc19
docker: pass SYNDEBUG
drptbl Sep 26, 2022
b44cf1c
add todo
drptbl Sep 26, 2022
b1ca0bf
chore(deps): Bump github/codeql-action from 2.1.25 to 2.1.26
dependabot[bot] Sep 30, 2022
6addda3
chore(deps): Bump actions/cache from 3.0.8 to 3.0.10
dependabot[bot] Oct 3, 2022
ac0f779
chore(deps): Bump actions/checkout from 3.0.2 to 3.1.0
dependabot[bot] Oct 4, 2022
e01c5a8
feat: added getExtensionDetails
drptbl Oct 5, 2022
df44f86
feat: add goToSettings
drptbl Oct 5, 2022
de4db05
feat: use goToAdvancedSettings
drptbl Oct 5, 2022
2891d7f
feat: use gotoaddnetwork
drptbl Oct 5, 2022
2c76fbd
feat: use goToImportAccount
drptbl Oct 5, 2022
2a4f323
feat: use goToNewAccount
drptbl Oct 5, 2022
7f76f40
Merge pull request #522 from Synthetixio/dependabot/github_actions/gi…
drptbl Oct 5, 2022
3d5d63a
Merge pull request #526 from Synthetixio/dependabot/github_actions/ac…
drptbl Oct 5, 2022
2cb2098
Merge pull request #528 from Synthetixio/dependabot/github_actions/ac…
drptbl Oct 5, 2022
5930e22
deps: update
drptbl Oct 5, 2022
0f31e5d
fix: addnetwork
drptbl Oct 5, 2022
859be0c
Squashed commit of the following:
drptbl Oct 5, 2022
85be0d6
fix: debug
drptbl Oct 5, 2022
99f871f
fix: add closePopup
drptbl Oct 5, 2022
52c79c5
docker: add env files
drptbl Oct 5, 2022
9090ebe
chore: improve warning for ngrok
drptbl Oct 5, 2022
4fd07e9
docker: remove res
drptbl Oct 5, 2022
3df12ec
chore: add note
drptbl Oct 5, 2022
07f95be
ci: use matrix
drptbl Oct 5, 2022
55afe96
ci: run tests on low and high res
drptbl Oct 5, 2022
0a10b68
fix: critical vuln
drptbl Oct 5, 2022
8c37c27
chore: trunk upgrade
drptbl Oct 5, 2022
fdbec7c
fix: linting
drptbl Oct 5, 2022
094f463
ci: cleanup not required
drptbl Oct 5, 2022
5db6231
ci: continue on error for high res
drptbl Oct 5, 2022
a187881
chore: increase closepopup timeout
drptbl Oct 5, 2022
baf0511
ci: continue on error
drptbl Oct 5, 2022
4dad622
docker: update ci compose
drptbl Oct 5, 2022
f780111
ci: use docker-compose.ci.yml
drptbl Oct 5, 2022
1c41d67
Merge pull request #530 from Synthetixio/fix-resolution-req
drptbl Oct 5, 2022
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
52 changes: 42 additions & 10 deletions .github/workflows/audit_and_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2

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

steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2

- name: Set yarn cache directory
run: yarn config set cache-folder .yarn-cache
continue-on-error: true

- uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77 # pin@v2
- uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2
with:
path: |
.yarn-cache
Expand All @@ -76,7 +76,7 @@ jobs:
if:
always() && (github.ref == 'refs/heads/master' || github.ref ==
'refs/heads/dev' || github.event_name == 'pull_request')
uses: github/codeql-action/upload-sarif@904260d7d935dff982205cbdb42025ce30b7a34f # pin@codeql-bundle-20210517
uses: github/codeql-action/upload-sarif@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44 # pin@codeql-bundle-20210517
with:
sarif_file: lint-results.sarif
continue-on-error: true
Expand All @@ -88,13 +88,17 @@ jobs:
github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' ||
github.event_name == 'pull_request'
runs-on: ubuntu-latest
# todo: to enable matrix strategy we need to have different wallets on each resolution because of transactions
# strategy:
# matrix:
# resolution: ['low', 'medium', 'high']

steps:
- name: Chown workspace
run: chown -R $(whoami) .

- name: Checkout
uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97 # pin@v2
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2

- name: Set up QEMU
uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 # pin@v1
Expand All @@ -103,15 +107,16 @@ jobs:
uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # pin@v1

- name: Cache Docker layers
uses: actions/cache@515d10b4fd9bb4858066bd5769f55bd498dcdd27 # pin@v2
uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Run e2e tests
run: ./start-tests.sh
- name: Run e2e tests (low res)
run: |
docker-compose -f docker-compose.ci.yml --env-file low-res.env up --build --exit-code-from synpress
env:
COMPOSE_DOCKER_CLI_BUILD: 1
DOCKER_BUILDKIT: 1
Expand All @@ -122,12 +127,39 @@ jobs:
CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: true

- name: Archive e2e artifacts (low res)
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # pin@v2
if: always()
with:
name: e2e-artifacts-low-res
path: |
docker/videos
docker/videos-ci
docker/screenshots
continue-on-error: true

- name: Run e2e tests (high res)
run: |
docker-compose -f docker-compose.ci.yml --env-file high-res.env up --build --exit-code-from synpress
env:
COMPOSE_DOCKER_CLI_BUILD: 1
DOCKER_BUILDKIT: 1
DOCKER_DEFAULT_PLATFORM: linux/amd64
NGROK_AUTH: ${{ secrets.NGROK_AUTH }}
CYPRESS_PRIVATE_KEY_WITH_FUNDS:
${{ secrets.CYPRESS_PRIVATE_KEY_WITH_FUNDS }}
CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: true

- name: Archive e2e artifacts
- name: Archive e2e artifacts (high res)
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # pin@v2
if: always()
with:
name: e2e-artifacts
name: e2e-artifacts-high-res
path: |
docker/videos
docker/videos-ci
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@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2

- name: Initialize CodeQL
uses: github/codeql-action/init@904260d7d935dff982205cbdb42025ce30b7a34f
uses: github/codeql-action/init@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
with:
queries: security-and-quality
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@904260d7d935dff982205cbdb42025ce30b7a34f
uses: github/codeql-action/analyze@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v2
with:
fetch-depth: 0
ref: master
Expand All @@ -36,7 +36,7 @@ jobs:
run: yarn config set cache-folder .yarn-cache
continue-on-error: true

- uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77 # pin@v2
- uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # pin@v2
with:
path: |
.yarn-cache
Expand Down
4 changes: 2 additions & 2 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*out
*logs
actions
notifications
*actions
*notifications
plugins
user_trunk.yaml
user.yaml
4 changes: 4 additions & 0 deletions .trunk/config/.hadolint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Following source doesn't work in most setups
ignored:
- SC1090
- SC1091
7 changes: 7 additions & 0 deletions .trunk/config/.shellcheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
enable=all
source-path=SCRIPTDIR
disable=SC2154

# If you're having issues with shellcheck following source, disable the errors via:
# disable=SC1090
# disable=SC1091
28 changes: 20 additions & 8 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
version: 0.1
runtimes:
enabled:
- [email protected]
- [email protected]
actions:
enabled:
- trunk-cache-prune
- trunk-upgrade-available
plugins:
sources:
- id: trunk
ref: v0.0.3
ref: v0.0.5
uri: https://github.com/trunk-io/plugins
cli:
version: 0.17.0-beta
version: 0.18.1-beta
sha256:
darwin_arm64: d0f10cede5ce6f2e9cf93c13b7422a87994c57912c2f1ec3b2b6273d965d3726
darwin_x86_64: de8cc96736b5888925523631926c1f5a0735bb086569ccdc3e2b62c2de2f4867
linux_x86_64: ddba5eb37e6885210b43f2466f8240fbeae5327506876705ef3935627d771d70
darwin_arm64: c25df7ef6d68a2bd8648d93830659d1675043db03d9f49182534f28e417dfda6
darwin_x86_64: 6a7a4f9c5d0ad7d3d5ea45e6a1cf11a668ea68c36f01ebe31ef95f99560a6824
linux_x86_64: d875fe70c221d6449a9cd09598ab278133c5513f52dbf6af0fca3161d7a39d46
lint:
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- git-diff-check@SYSTEM
- gitleaks@8.11.2
- gitleaks@8.13.0
- [email protected]
- [email protected]
ignore:
Expand Down
Loading