diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml index 71405a78d..5ab1e52de 100644 --- a/.github/workflows/e2e-mac.yml +++ b/.github/workflows/e2e-mac.yml @@ -3,7 +3,13 @@ name: E2E Mac on: [workflow_call] jobs: mac: - runs-on: macos-13 + runs-on: ${{ matrix.os }} + + strategy: + matrix: + # macos-13 is the latest intel runner, macos-14 is the current stable M1 runner + os: [macos-13, macos-14] + timeout-minutes: 180 env: TEST_MODE: true @@ -63,20 +69,20 @@ jobs: - name: Run user profile test uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 with: - timeout_minutes: 25 + timeout_minutes: 15 max_attempts: 3 command: cd packages/e2e-tests && npm run test userProfile.test.ts - name: Run multiple clients test uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 with: - timeout_minutes: 25 + timeout_minutes: 30 max_attempts: 3 command: cd packages/e2e-tests && npm run test multipleClients.test.ts - name: Run invitation link test - Includes 2 separate application clients uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 with: - timeout_minutes: 25 + timeout_minutes: 15 max_attempts: 3 command: cd packages/e2e-tests && npm run test invitationLink.test.ts diff --git a/packages/desktop/README.md b/packages/desktop/README.md index 1e7afa36a..25ebdc849 100644 --- a/packages/desktop/README.md +++ b/packages/desktop/README.md @@ -8,9 +8,10 @@ Here are the steps: 2. In `quiet/` (project's root) install monorepo's dependencies and bootstrap the project with lerna. It will take care of the package's dependencies and trigger a prepublish script which builds them. ``` +nvm use npm i lerna@6.6.2 npm i typescript@4.9.3 -npm run lerna bootstrap +npm run bootstrap ``` If you run into problems please double check if you have exact version Node and NPM as listed in point 0.