Skip to content

Commit

Permalink
Merge pull request #530 from Synthetixio/fix-resolution-req
Browse files Browse the repository at this point in the history
fix: high resolution requirement
  • Loading branch information
drptbl authored Oct 5, 2022
2 parents 2cb2098 + f780111 commit 1c41d67
Show file tree
Hide file tree
Showing 16 changed files with 331 additions and 191 deletions.
40 changes: 36 additions & 4 deletions .github/workflows/audit_and_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ 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
Expand All @@ -110,8 +114,9 @@ jobs:
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
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

0 comments on commit 1c41d67

Please sign in to comment.