From d0214ff01442e4a0ca95cd52d79ff62779ab1232 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 09:46:17 +0100 Subject: [PATCH 01/74] check 1.1.0 --- packages/e2e-tests/crossplatform.utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e-tests/crossplatform.utils.ts b/packages/e2e-tests/crossplatform.utils.ts index b74573f293..76f122fd0f 100644 --- a/packages/e2e-tests/crossplatform.utils.ts +++ b/packages/e2e-tests/crossplatform.utils.ts @@ -18,7 +18,7 @@ export class BuildSetup { private getBinaryLocation() { switch (process.platform) { case 'linux': - return `${__dirname}/Quiet/Quiet-1.0.0.AppImage` + return `${__dirname}/Quiet/Quiet-1.1.0.AppImage` case 'win32': return `${process.env.LOCALAPPDATA}\\Programs\\quiet\\Quiet.exe` case 'darwin': From fd4631711a60fb2dd377b95c3252899d0f0f1349 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 09:48:24 +0100 Subject: [PATCH 02/74] workflow 1.1.0 --- .github/workflows/e2e-crossplatform.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index a15c25543a..16377fb52e 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -22,18 +22,18 @@ jobs: - name: Download DMG working-directory: ./packages/e2e-tests/Quiet - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.0.0/Quiet-1.0.0.dmg + run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - name: Chmod working-directory: ./packages/e2e-tests/Quiet - run: chmod +x Quiet-1.0.0.dmg + run: chmod +x Quiet-1.1.0.dmg - name: Mount installer file in volume on system working-directory: ./packages/e2e-tests/Quiet - run: hdiutil mount Quiet-1.0.0.dmg + run: hdiutil mount Quiet-1.1.0.dmg - name: Add App file to applications - run: cd ~ && cp -R "/Volumes/Quiet 1.0.0/Quiet.app" /Applications + run: cd ~ && cp -R "/Volumes/Quiet 1.1.0/Quiet.app" /Applications - name: Run smoke test uses: nick-fields/retry@v2 @@ -87,11 +87,11 @@ jobs: - name: Download App Image working-directory: ./packages/e2e-tests/Quiet - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.0.0/Quiet-1.0.0.AppImage + run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage - name: Chmod working-directory: ./packages/e2e-tests/Quiet - run: chmod +x Quiet-1.0.0.AppImage + run: chmod +x Quiet-1.1.0.AppImage - name: Run smoke test uses: nick-fields/retry@v2 @@ -123,15 +123,15 @@ jobs: bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - name: Download EXE - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.0.0/Quiet.Setup.1.0.0.exe + run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe shell: bash - name: Chmod - run: chmod +x Quiet.Setup.1.0.0.exe + run: chmod +x Quiet.Setup.1.1.0.exe shell: bash - name: Install exe - run: Start-Process Quiet.Setup.1.0.0.exe -Wait + run: Start-Process Quiet.Setup.1.1.0.exe -Wait shell: powershell - name: Kill exe From 3df42a554666ab4dfe8c203475bf8c9bc4a51a48 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 11:06:28 +0100 Subject: [PATCH 03/74] try build linux app on CI --- .github/workflows/e2e-crossplatform.yml | 147 +++++++++++----------- packages/e2e-tests/crossplatform.utils.ts | 2 +- 2 files changed, 78 insertions(+), 71 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 16377fb52e..bbbcf4539d 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -5,49 +5,49 @@ on: pull_request: jobs: - mac: - runs-on: macos-latest - timeout-minutes: 180 - env: - ELECTRON_CUSTOM_VERSION: 23.0.0 + # mac: + # runs-on: macos-latest + # timeout-minutes: 180 + # env: + # ELECTRON_CUSTOM_VERSION: 23.0.0 - steps: - - uses: actions/checkout@v2 + # steps: + # - uses: actions/checkout@v2 - - name: "Setup environment" - uses: ./.github/actions/setup-env - with: - cachePrefix: "e2e-crossplatform-mac" - bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + # - name: "Setup environment" + # uses: ./.github/actions/setup-env + # with: + # cachePrefix: "e2e-crossplatform-mac" + # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - name: Download DMG - working-directory: ./packages/e2e-tests/Quiet - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg + # - name: Download DMG + # working-directory: ./packages/e2e-tests/Quiet + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - - name: Chmod - working-directory: ./packages/e2e-tests/Quiet - run: chmod +x Quiet-1.1.0.dmg + # - name: Chmod + # working-directory: ./packages/e2e-tests/Quiet + # run: chmod +x Quiet-1.1.0.dmg - - name: Mount installer file in volume on system - working-directory: ./packages/e2e-tests/Quiet - run: hdiutil mount Quiet-1.1.0.dmg + # - name: Mount installer file in volume on system + # working-directory: ./packages/e2e-tests/Quiet + # run: hdiutil mount Quiet-1.1.0.dmg - - name: Add App file to applications - run: cd ~ && cp -R "/Volumes/Quiet 1.1.0/Quiet.app" /Applications + # - name: Add App file to applications + # run: cd ~ && cp -R "/Volumes/Quiet 1.1.0/Quiet.app" /Applications - - name: Run smoke test - uses: nick-fields/retry@v2 - with: - timeout_minutes: 25 - max_attempts: 3 - command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + # - name: Run smoke test + # uses: nick-fields/retry@v2 + # with: + # timeout_minutes: 25 + # max_attempts: 3 + # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts - - name: Run newUser test - Includes 2 separate application clients - uses: nick-fields/retry@v2 - with: - timeout_minutes: 35 - max_attempts: 3 - command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts + # - name: Run newUser test - Includes 2 separate application clients + # uses: nick-fields/retry@v2 + # with: + # timeout_minutes: 35 + # max_attempts: 3 + # command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts @@ -85,13 +85,17 @@ jobs: sleep 3 fluxbox & - - name: Download App Image - working-directory: ./packages/e2e-tests/Quiet - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage + # - name: Download App Image + # working-directory: ./packages/e2e-tests/Quiet + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage + + - name: Build App Image + working-directory: ./packages/desktop + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - name: Chmod working-directory: ./packages/e2e-tests/Quiet - run: chmod +x Quiet-1.1.0.AppImage + run: chmod +x $FILE_NAME - name: Run smoke test uses: nick-fields/retry@v2 @@ -107,44 +111,47 @@ jobs: max_attempts: 3 command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts - windows: - runs-on: windows-2019 - timeout-minutes: 180 - env: - ELECTRON_CUSTOM_VERSION: 23.0.0 + # windows: + # runs-on: windows-2019 + # timeout-minutes: 180 + # env: + # ELECTRON_CUSTOM_VERSION: 23.0.0 - steps: - - uses: actions/checkout@v2 + # steps: + # - uses: actions/checkout@v2 - - name: "Setup environment" - uses: ./.github/actions/setup-env - with: - cachePrefix: "e2e-crossplatform-windows" - bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + # - name: "Setup environment" + # uses: ./.github/actions/setup-env + # with: + # cachePrefix: "e2e-crossplatform-windows" + # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - name: Download EXE - run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe - shell: bash + # - name: Download EXE + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe + # shell: bash - - name: Chmod - run: chmod +x Quiet.Setup.1.1.0.exe - shell: bash + # - name: Chmod + # run: chmod +x Quiet.Setup.1.1.0.exe + # shell: bash + + # - name: Install exe + # run: Start-Process Quiet.Setup.1.1.0.exe -Wait + # shell: powershell + + # - name: Kill exe + # run: Stop-Process -Name "Quiet" -Force + # shell: powershell + + # - name: Run smoke test + # uses: nick-fields/retry@v2 + # with: + # timeout_minutes: 25 + # max_attempts: 3 + # shell: bash + # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts - - name: Install exe - run: Start-Process Quiet.Setup.1.1.0.exe -Wait - shell: powershell - - name: Kill exe - run: Stop-Process -Name "Quiet" -Force - shell: powershell - - name: Run smoke test - uses: nick-fields/retry@v2 - with: - timeout_minutes: 25 - max_attempts: 3 - shell: bash - command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts # Will be fixed in next tasks # - name: Run newUser test - Includes 2 separate application clients # uses: nick-fields/retry@v2 diff --git a/packages/e2e-tests/crossplatform.utils.ts b/packages/e2e-tests/crossplatform.utils.ts index 76f122fd0f..a8fcb927d0 100644 --- a/packages/e2e-tests/crossplatform.utils.ts +++ b/packages/e2e-tests/crossplatform.utils.ts @@ -18,7 +18,7 @@ export class BuildSetup { private getBinaryLocation() { switch (process.platform) { case 'linux': - return `${__dirname}/Quiet/Quiet-1.1.0.AppImage` + return `${__dirname}/Quiet/${process.env.FILE_NAME}` case 'win32': return `${process.env.LOCALAPPDATA}\\Programs\\quiet\\Quiet.exe` case 'darwin': From 8a2f23544ab292ae1eb4a2c27cad97749e0b5c5f Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 11:19:48 +0100 Subject: [PATCH 04/74] add FILE_NAME --- .github/workflows/e2e-crossplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index bbbcf4539d..7cddc88178 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -63,6 +63,7 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" + FILE_NAME: "" steps: - uses: actions/checkout@v2 From 72b60d5ddb3fb7df25b1cf0d206626726eff12e7 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 11:35:49 +0100 Subject: [PATCH 05/74] print name --- .github/workflows/e2e-crossplatform.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 7cddc88178..7864592f49 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -92,7 +92,10 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + + - name: Print name + run: echo "FILE_NAME $FILE_NAME" - name: Chmod working-directory: ./packages/e2e-tests/Quiet From ecb4a77ed7bb90dddb032b3242b650c5510d1f1b Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 11:41:11 +0100 Subject: [PATCH 06/74] set env --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 7864592f49..dd8515cdc1 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -92,7 +92,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME && echo FILE_NAME >> $FILE_NAME - name: Print name run: echo "FILE_NAME $FILE_NAME" From 82be96f288f049b9f78c74c3efc0ba34d50afad2 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 12:04:07 +0100 Subject: [PATCH 07/74] set env2 --- .github/workflows/e2e-crossplatform.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index dd8515cdc1..9d2b847b42 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -63,7 +63,6 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" - FILE_NAME: "" steps: - uses: actions/checkout@v2 @@ -92,10 +91,10 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME && echo FILE_NAME >> $FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - - name: Print name - run: echo "FILE_NAME $FILE_NAME" + - name: Test + run: echo $FILE_NAME - name: Chmod working-directory: ./packages/e2e-tests/Quiet From 3f587ee4cb549c183dfd5b6a2e569922b77cd6e8 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 12:20:15 +0100 Subject: [PATCH 08/74] fix set env --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 9d2b847b42..be915554e5 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -91,7 +91,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - name: Test run: echo $FILE_NAME From 6c212c92ca7dc567725d5e3f2846c48a50378bd4 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:02:42 +0100 Subject: [PATCH 09/74] build dmg --- .github/workflows/e2e-crossplatform.yml | 81 +++++++++++++------------ 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index be915554e5..7a3a649ddb 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -5,49 +5,57 @@ on: pull_request: jobs: - # mac: - # runs-on: macos-latest - # timeout-minutes: 180 - # env: - # ELECTRON_CUSTOM_VERSION: 23.0.0 + mac: + runs-on: macos-latest + timeout-minutes: 180 + env: + ELECTRON_CUSTOM_VERSION: 23.0.0 - # steps: - # - uses: actions/checkout@v2 + steps: + - uses: actions/checkout@v2 - # - name: "Setup environment" - # uses: ./.github/actions/setup-env - # with: - # cachePrefix: "e2e-crossplatform-mac" - # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + - name: "Setup environment" + uses: ./.github/actions/setup-env + with: + cachePrefix: "e2e-crossplatform-mac" + bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - # - name: Download DMG - # working-directory: ./packages/e2e-tests/Quiet - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg + # - name: Download DMG + # working-directory: ./packages/e2e-tests/Quiet + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - # - name: Chmod - # working-directory: ./packages/e2e-tests/Quiet - # run: chmod +x Quiet-1.1.0.dmg + - name: Build App Image + working-directory: ./packages/desktop + run: npm run dist && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - # - name: Mount installer file in volume on system - # working-directory: ./packages/e2e-tests/Quiet - # run: hdiutil mount Quiet-1.1.0.dmg + # - name: Chmod + # working-directory: ./packages/e2e-tests/Quiet + # run: chmod +x Quiet-1.1.0.dmg - # - name: Add App file to applications - # run: cd ~ && cp -R "/Volumes/Quiet 1.1.0/Quiet.app" /Applications + - name: Chmod + working-directory: ./packages/e2e-tests/Quiet + run: chmod +x $FILE_NAME - # - name: Run smoke test - # uses: nick-fields/retry@v2 - # with: - # timeout_minutes: 25 - # max_attempts: 3 - # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + - name: Mount installer file in volume on system + working-directory: ./packages/e2e-tests/Quiet + run: hdiutil mount $FILE_NAME - # - name: Run newUser test - Includes 2 separate application clients - # uses: nick-fields/retry@v2 - # with: - # timeout_minutes: 35 - # max_attempts: 3 - # command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts + - name: Add App file to applications + run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications + + - name: Run smoke test + uses: nick-fields/retry@v2 + with: + timeout_minutes: 25 + max_attempts: 3 + command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + + - name: Run newUser test - Includes 2 separate application clients + uses: nick-fields/retry@v2 + with: + timeout_minutes: 35 + max_attempts: 3 + command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts @@ -93,9 +101,6 @@ jobs: working-directory: ./packages/desktop run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - - name: Test - run: echo $FILE_NAME - - name: Chmod working-directory: ./packages/e2e-tests/Quiet run: chmod +x $FILE_NAME From 32c0e56fe660d235bbead9e6ee0352a41947a94c Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:18:24 +0100 Subject: [PATCH 10/74] test mode true --- .github/workflows/e2e-crossplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 7a3a649ddb..debcd87609 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -10,6 +10,7 @@ jobs: timeout-minutes: 180 env: ELECTRON_CUSTOM_VERSION: 23.0.0 + TEST_MODE: true steps: - uses: actions/checkout@v2 From c30a62badcf6b9bd3547b32e9912242412c4cac2 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:21:21 +0100 Subject: [PATCH 11/74] add windows --- .github/workflows/e2e-crossplatform.yml | 82 +++++++++++++------------ 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index debcd87609..78afd13b7f 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -120,44 +120,50 @@ jobs: max_attempts: 3 command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts - # windows: - # runs-on: windows-2019 - # timeout-minutes: 180 - # env: - # ELECTRON_CUSTOM_VERSION: 23.0.0 - - # steps: - # - uses: actions/checkout@v2 - - # - name: "Setup environment" - # uses: ./.github/actions/setup-env - # with: - # cachePrefix: "e2e-crossplatform-windows" - # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - # - name: Download EXE - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe - # shell: bash - - # - name: Chmod - # run: chmod +x Quiet.Setup.1.1.0.exe - # shell: bash - - # - name: Install exe - # run: Start-Process Quiet.Setup.1.1.0.exe -Wait - # shell: powershell - - # - name: Kill exe - # run: Stop-Process -Name "Quiet" -Force - # shell: powershell - - # - name: Run smoke test - # uses: nick-fields/retry@v2 - # with: - # timeout_minutes: 25 - # max_attempts: 3 - # shell: bash - # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + windows: + runs-on: windows-2019 + timeout-minutes: 180 + env: + ELECTRON_CUSTOM_VERSION: 23.0.0 + + steps: + - uses: actions/checkout@v2 + + - name: "Setup environment" + uses: ./.github/actions/setup-env + with: + cachePrefix: "e2e-crossplatform-windows" + bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + + # - name: Download EXE + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe + # shell: bash + + - name: Build App Image + working-directory: ./packages/desktop + run: npm run distwin && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV + shell: bash + + - name: Chmod + working-directory: ./packages/desktop/dist + run: chmod +x $FILE_NAME + shell: bash + + - name: Install exe + run: Start-Process $FILE_NAME -Wait + shell: powershell + + - name: Kill exe + run: Stop-Process -Name "Quiet" -Force + shell: powershell + + - name: Run smoke test + uses: nick-fields/retry@v2 + with: + timeout_minutes: 25 + max_attempts: 3 + shell: bash + command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts From d501db1746ffde08fa63b3a04decff704383b5c8 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:23:41 +0100 Subject: [PATCH 12/74] add dir for windows --- .github/workflows/e2e-crossplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 78afd13b7f..bc7e321f4b 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -151,6 +151,7 @@ jobs: - name: Install exe run: Start-Process $FILE_NAME -Wait + working-directory: ./packages/desktop/dist shell: powershell - name: Kill exe From 52c00ce5d844ddd59b3f988ec1ea83f3d8522aa5 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:37:31 +0100 Subject: [PATCH 13/74] test run dist on mac --- .github/workflows/e2e-crossplatform.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index bc7e321f4b..b843757350 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -24,6 +24,9 @@ jobs: # - name: Download DMG # working-directory: ./packages/e2e-tests/Quiet # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg + - name: Build App Image 1 + working-directory: ./packages/desktop + run: npm run dist - name: Build App Image working-directory: ./packages/desktop From c75f2af284cff8692c080cf56079604d376d8403 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:42:33 +0100 Subject: [PATCH 14/74] add build for windows --- .github/workflows/e2e-crossplatform.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index b843757350..d3bbfcf227 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -141,6 +141,10 @@ jobs: # - name: Download EXE # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe # shell: bash + - name: Build App Image 1 + working-directory: ./packages/desktop + run: npm run distwin + # shell: bash - name: Build App Image working-directory: ./packages/desktop From 7910bf452479dd8d9ecd275174f231d71cbdad7d Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 13:58:39 +0100 Subject: [PATCH 15/74] shell bash --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index d3bbfcf227..18f9188361 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -144,7 +144,7 @@ jobs: - name: Build App Image 1 working-directory: ./packages/desktop run: npm run distwin - # shell: bash + shell: bash - name: Build App Image working-directory: ./packages/desktop From 0de922da04f6408251164988198dad0288a94287 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 14:25:41 +0100 Subject: [PATCH 16/74] mac before build and electron builder --- .github/workflows/e2e-crossplatform.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 18f9188361..afaddbe3ad 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -24,13 +24,18 @@ jobs: # - name: Download DMG # working-directory: ./packages/e2e-tests/Quiet # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - - name: Build App Image 1 - working-directory: ./packages/desktop - run: npm run dist + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: darwin - name: Build App Image working-directory: ./packages/desktop - run: npm run dist && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: electron-builder --mac + + - name: Extra steps + working-directory: ./packages/desktop + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME # - name: Chmod # working-directory: ./packages/e2e-tests/Quiet From c3f0e16ce878408a06ccd922987958d109d80cd1 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 14:40:46 +0100 Subject: [PATCH 17/74] use node modules --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index afaddbe3ad..8afab9549a 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -31,7 +31,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: electron-builder --mac + run: node_modules/.bin/electron-builder --mac - name: Extra steps working-directory: ./packages/desktop From c5c3c22cc3404ff8dda445aaf1c0eafaae04a345 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 15:19:49 +0100 Subject: [PATCH 18/74] win32 --- .github/workflows/e2e-crossplatform.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 8afab9549a..38899930e0 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -31,7 +31,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: node_modules/.bin/electron-builder --mac + run: node_modules/.bin/electron-builder -p never --mac - name: Extra steps working-directory: ./packages/desktop @@ -143,17 +143,18 @@ jobs: cachePrefix: "e2e-crossplatform-windows" bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - # - name: Download EXE - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet.Setup.1.1.0.exe - # shell: bash - - name: Build App Image 1 + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: win32 + + - name: Build App Image working-directory: ./packages/desktop - run: npm run distwin - shell: bash + run: node_modules/.bin/electron-builder --win - name: Build App Image working-directory: ./packages/desktop - run: npm run distwin && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV shell: bash - name: Chmod From c2d27e4dd8fbac426bc6a8d5602a3509403bc98c Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 15:41:07 +0100 Subject: [PATCH 19/74] linux and windows changes --- .github/workflows/e2e-crossplatform.yml | 132 +++++++++++++----------- 1 file changed, 71 insertions(+), 61 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 38899930e0..f4d8386257 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -5,66 +5,66 @@ on: pull_request: jobs: - mac: - runs-on: macos-latest - timeout-minutes: 180 - env: - ELECTRON_CUSTOM_VERSION: 23.0.0 - TEST_MODE: true - - steps: - - uses: actions/checkout@v2 - - - name: "Setup environment" - uses: ./.github/actions/setup-env - with: - cachePrefix: "e2e-crossplatform-mac" - bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - # - name: Download DMG - # working-directory: ./packages/e2e-tests/Quiet - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - - name: Before build - uses: ./.github/actions/before-build - with: - source-path: darwin - - - name: Build App Image - working-directory: ./packages/desktop - run: node_modules/.bin/electron-builder -p never --mac - - - name: Extra steps - working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - - # - name: Chmod - # working-directory: ./packages/e2e-tests/Quiet - # run: chmod +x Quiet-1.1.0.dmg - - - name: Chmod - working-directory: ./packages/e2e-tests/Quiet - run: chmod +x $FILE_NAME - - - name: Mount installer file in volume on system - working-directory: ./packages/e2e-tests/Quiet - run: hdiutil mount $FILE_NAME - - - name: Add App file to applications - run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications - - - name: Run smoke test - uses: nick-fields/retry@v2 - with: - timeout_minutes: 25 - max_attempts: 3 - command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts - - - name: Run newUser test - Includes 2 separate application clients - uses: nick-fields/retry@v2 - with: - timeout_minutes: 35 - max_attempts: 3 - command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts + # mac: + # runs-on: macos-latest + # timeout-minutes: 180 + # env: + # ELECTRON_CUSTOM_VERSION: 23.0.0 + # TEST_MODE: true + + # steps: + # - uses: actions/checkout@v2 + + # - name: "Setup environment" + # uses: ./.github/actions/setup-env + # with: + # cachePrefix: "e2e-crossplatform-mac" + # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + + # # - name: Download DMG + # # working-directory: ./packages/e2e-tests/Quiet + # # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg + # - name: Before build + # uses: ./.github/actions/before-build + # with: + # source-path: darwin + + # - name: Build App Image + # working-directory: ./packages/desktop + # run: node_modules/.bin/electron-builder -p never --mac + + # - name: Extra steps + # working-directory: ./packages/desktop + # run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + + # # - name: Chmod + # # working-directory: ./packages/e2e-tests/Quiet + # # run: chmod +x Quiet-1.1.0.dmg + + # - name: Chmod + # working-directory: ./packages/e2e-tests/Quiet + # run: chmod +x $FILE_NAME + + # - name: Mount installer file in volume on system + # working-directory: ./packages/e2e-tests/Quiet + # run: hdiutil mount $FILE_NAME + + # - name: Add App file to applications + # run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications + + # - name: Run smoke test + # uses: nick-fields/retry@v2 + # with: + # timeout_minutes: 25 + # max_attempts: 3 + # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + + # - name: Run newUser test - Includes 2 separate application clients + # uses: nick-fields/retry@v2 + # with: + # timeout_minutes: 35 + # max_attempts: 3 + # command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts @@ -80,6 +80,7 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" + TEST_MODE: true steps: - uses: actions/checkout@v2 @@ -105,10 +106,18 @@ jobs: # - name: Download App Image # working-directory: ./packages/e2e-tests/Quiet # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: linux + + - name: Build + working-directory: ./packages/desktop + run: node_modules/.bin/electron-builder --linux - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - name: Chmod working-directory: ./packages/e2e-tests/Quiet @@ -133,6 +142,7 @@ jobs: timeout-minutes: 180 env: ELECTRON_CUSTOM_VERSION: 23.0.0 + TEST_MODE: true steps: - uses: actions/checkout@v2 From 9cfcc520c1a66d76955557c0e3ba360a0a10ddaa Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 15:56:28 +0100 Subject: [PATCH 20/74] add arch --- .github/workflows/e2e-crossplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f4d8386257..63d59bd866 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -81,6 +81,7 @@ jobs: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" TEST_MODE: true + ARCH: x86_64 steps: - uses: actions/checkout@v2 From 7736d05e26fb78e96a47037691c687a0567db176 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 15:59:14 +0100 Subject: [PATCH 21/74] debug modal --- .github/workflows/e2e-crossplatform.yml | 16 ++++++++-------- packages/e2e-tests/newUser.crossplatform.test.ts | 2 +- packages/e2e-tests/smoke.crossplatform.test.ts | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 63d59bd866..070640d78e 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -107,18 +107,18 @@ jobs: # - name: Download App Image # working-directory: ./packages/e2e-tests/Quiet # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage - - name: Before build - uses: ./.github/actions/before-build - with: - source-path: linux + # - name: Before build + # uses: ./.github/actions/before-build + # with: + # source-path: linux - - name: Build - working-directory: ./packages/desktop - run: node_modules/.bin/electron-builder --linux + # - name: Build + # working-directory: ./packages/desktop + # run: node_modules/.bin/electron-builder --linux - name: Build App Image working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - name: Chmod working-directory: ./packages/e2e-tests/Quiet diff --git a/packages/e2e-tests/newUser.crossplatform.test.ts b/packages/e2e-tests/newUser.crossplatform.test.ts index 82e535f048..dfc4c21297 100644 --- a/packages/e2e-tests/newUser.crossplatform.test.ts +++ b/packages/e2e-tests/newUser.crossplatform.test.ts @@ -50,7 +50,7 @@ describe('New User', () => { await buildSetup2.killChromeDriver() }) describe('Stages:', () => { - it.skip('Close debug modal', async () => { + it('Close debug modal', async () => { console.log('Debug modal') const debugModal = new DebugModeModal(driver) await debugModal.element.isDisplayed() diff --git a/packages/e2e-tests/smoke.crossplatform.test.ts b/packages/e2e-tests/smoke.crossplatform.test.ts index 2689bfb81d..f25fe1aac6 100644 --- a/packages/e2e-tests/smoke.crossplatform.test.ts +++ b/packages/e2e-tests/smoke.crossplatform.test.ts @@ -27,7 +27,7 @@ describe('Smoke', () => { await buildSetup.killChromeDriver() }) describe('Stages:', () => { - it.skip('Close debug modal', async () => { + it('Close debug modal', async () => { console.log('Debug modal') const debugModal = new DebugModeModal(driver) await debugModal.element.isDisplayed() From fb4e3fc65387fcff86072c9a7daf78dbf785eda8 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 15:59:54 +0100 Subject: [PATCH 22/74] remove old envs --- .github/workflows/e2e-crossplatform.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 070640d78e..272485fa92 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -80,8 +80,6 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" - TEST_MODE: true - ARCH: x86_64 steps: - uses: actions/checkout@v2 From df0fd59ea1b0c5a6e4c67d7cfdb604fea6ca36c3 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 16:24:01 +0100 Subject: [PATCH 23/74] add log --- .github/workflows/e2e-crossplatform.yml | 12 ------------ packages/e2e-tests/crossplatform.utils.ts | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 272485fa92..9451f6643b 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -102,18 +102,6 @@ jobs: sleep 3 fluxbox & - # - name: Download App Image - # working-directory: ./packages/e2e-tests/Quiet - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.AppImage - # - name: Before build - # uses: ./.github/actions/before-build - # with: - # source-path: linux - - # - name: Build - # working-directory: ./packages/desktop - # run: node_modules/.bin/electron-builder --linux - - name: Build App Image working-directory: ./packages/desktop run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME diff --git a/packages/e2e-tests/crossplatform.utils.ts b/packages/e2e-tests/crossplatform.utils.ts index a8fcb927d0..f2481dfb84 100644 --- a/packages/e2e-tests/crossplatform.utils.ts +++ b/packages/e2e-tests/crossplatform.utils.ts @@ -16,6 +16,7 @@ export class BuildSetup { } private getBinaryLocation() { + console.log('!@!@@!@!@!@@@!@!@@@!@!!!@@@@@@@@@@@@@', `${__dirname}/Quiet/${process.env.FILE_NAME}`) switch (process.platform) { case 'linux': return `${__dirname}/Quiet/${process.env.FILE_NAME}` From 2950140f8ffe527970359bc39ffea9e2b0fd4f41 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 16:28:19 +0100 Subject: [PATCH 24/74] modal for second user --- packages/e2e-tests/newUser.crossplatform.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e-tests/newUser.crossplatform.test.ts b/packages/e2e-tests/newUser.crossplatform.test.ts index dfc4c21297..903025367c 100644 --- a/packages/e2e-tests/newUser.crossplatform.test.ts +++ b/packages/e2e-tests/newUser.crossplatform.test.ts @@ -144,7 +144,7 @@ describe('New User', () => { await new Promise(resolve => setTimeout(() => resolve(), 10000)) }) - it.skip('Close debug modal', async () => { + it('Close debug modal', async () => { console.log('Debug modal') const debugModal = new DebugModeModal(driver2) await debugModal.element.isDisplayed() From ba6eae2a18105c2adbd961a2e9fe81faf2fca921 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 16:34:54 +0100 Subject: [PATCH 25/74] distWin --- .github/workflows/e2e-crossplatform.yml | 132 ++++++++++++------------ packages/desktop/package.json | 2 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 9451f6643b..cf587721eb 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -5,66 +5,66 @@ on: pull_request: jobs: - # mac: - # runs-on: macos-latest - # timeout-minutes: 180 - # env: - # ELECTRON_CUSTOM_VERSION: 23.0.0 - # TEST_MODE: true - - # steps: - # - uses: actions/checkout@v2 - - # - name: "Setup environment" - # uses: ./.github/actions/setup-env - # with: - # cachePrefix: "e2e-crossplatform-mac" - # bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - # # - name: Download DMG - # # working-directory: ./packages/e2e-tests/Quiet - # # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - # - name: Before build - # uses: ./.github/actions/before-build - # with: - # source-path: darwin - - # - name: Build App Image - # working-directory: ./packages/desktop - # run: node_modules/.bin/electron-builder -p never --mac - - # - name: Extra steps - # working-directory: ./packages/desktop - # run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - - # # - name: Chmod - # # working-directory: ./packages/e2e-tests/Quiet - # # run: chmod +x Quiet-1.1.0.dmg - - # - name: Chmod - # working-directory: ./packages/e2e-tests/Quiet - # run: chmod +x $FILE_NAME - - # - name: Mount installer file in volume on system - # working-directory: ./packages/e2e-tests/Quiet - # run: hdiutil mount $FILE_NAME - - # - name: Add App file to applications - # run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications - - # - name: Run smoke test - # uses: nick-fields/retry@v2 - # with: - # timeout_minutes: 25 - # max_attempts: 3 - # command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts - - # - name: Run newUser test - Includes 2 separate application clients - # uses: nick-fields/retry@v2 - # with: - # timeout_minutes: 35 - # max_attempts: 3 - # command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts + mac: + runs-on: macos-latest + timeout-minutes: 180 + env: + ELECTRON_CUSTOM_VERSION: 23.0.0 + TEST_MODE: true + + steps: + - uses: actions/checkout@v2 + + - name: "Setup environment" + uses: ./.github/actions/setup-env + with: + cachePrefix: "e2e-crossplatform-mac" + bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + + # - name: Download DMG + # working-directory: ./packages/e2e-tests/Quiet + # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: darwin + + - name: Build App Image + working-directory: ./packages/desktop + run: node_modules/.bin/electron-builder -p never --mac + + - name: Extra steps + working-directory: ./packages/desktop + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + + # - name: Chmod + # working-directory: ./packages/e2e-tests/Quiet + # run: chmod +x Quiet-1.1.0.dmg + + - name: Chmod + working-directory: ./packages/e2e-tests/Quiet + run: chmod +x $FILE_NAME + + - name: Mount installer file in volume on system + working-directory: ./packages/e2e-tests/Quiet + run: hdiutil mount $FILE_NAME + + - name: Add App file to applications + run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications + + - name: Run smoke test + uses: nick-fields/retry@v2 + with: + timeout_minutes: 25 + max_attempts: 3 + command: cd packages/e2e-tests && npm run test smoke.crossplatform.test.ts + + - name: Run newUser test - Includes 2 separate application clients + uses: nick-fields/retry@v2 + with: + timeout_minutes: 35 + max_attempts: 3 + command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts @@ -140,18 +140,18 @@ jobs: cachePrefix: "e2e-crossplatform-windows" bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - - name: Before build - uses: ./.github/actions/before-build - with: - source-path: win32 + # - name: Before build + # uses: ./.github/actions/before-build + # with: + # source-path: win32 - name: Build App Image working-directory: ./packages/desktop - run: node_modules/.bin/electron-builder --win + run: npm run distWin - name: Build App Image working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV + run: npm run distWin && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV shell: bash - name: Chmod diff --git a/packages/desktop/package.json b/packages/desktop/package.json index daea0300ae..a8ea084209 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -88,7 +88,7 @@ "pullBinariesWin": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/tor.exe -P ./tor/ && chmod 775 ./tor/tor.exe", "dist": "export SOURCE_PATH=darwin && npm run copyBinaries && npm run build:prod && electron-builder --mac", "distUbuntu": "export SOURCE_PATH=linux TEST_MODE=true && npm run setMainEnvs && npm run copyBinaries && npm run pullLibs && npm run build:prod && electron-builder --linux", - "distwin": "export SOURCE_PATH=win32 && npm run copyBinariesWin && npm run build:prod && electron-builder --win", + "distWin": "set SOURCE_PATH=win32 TEST_MODE=true && npm run copyBinariesWin && npm run build:prod && electron-builder --win", "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix", "lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/", "type-check": "tsc -p tsconfig.build.json --noEmit", From 2ae4cf54fac2eb1f1f21b607c39fb541a3cf1a69 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 16:38:03 +0100 Subject: [PATCH 26/74] try on mac --- .github/workflows/e2e-crossplatform.yml | 15 ++++++--------- packages/desktop/package.json | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index cf587721eb..7d52b2b664 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -21,21 +21,18 @@ jobs: cachePrefix: "e2e-crossplatform-mac" bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - # - name: Download DMG - # working-directory: ./packages/e2e-tests/Quiet - # run: curl -LO https://github.com/TryQuiet/quiet/releases/download/quiet%401.1.0/Quiet-1.1.0.dmg - - name: Before build - uses: ./.github/actions/before-build - with: - source-path: darwin + # - name: Before build + # uses: ./.github/actions/before-build + # with: + # source-path: darwin - name: Build App Image working-directory: ./packages/desktop - run: node_modules/.bin/electron-builder -p never --mac + run: npm run dist - name: Extra steps working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run dist && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME # - name: Chmod # working-directory: ./packages/e2e-tests/Quiet diff --git a/packages/desktop/package.json b/packages/desktop/package.json index a8ea084209..6fce4730fe 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -86,7 +86,7 @@ "pullBinaries": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/tor -P ./tor/ && chmod 775 ./tor/tor", "pullLibs": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/libssl.so -P ./ && chmod 775 ./libssl.so", "pullBinariesWin": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/tor.exe -P ./tor/ && chmod 775 ./tor/tor.exe", - "dist": "export SOURCE_PATH=darwin && npm run copyBinaries && npm run build:prod && electron-builder --mac", + "dist": "export SOURCE_PATH=darwin TEST_MODE=true && npm run copyBinaries && npm run build:prod && electron-builder --mac", "distUbuntu": "export SOURCE_PATH=linux TEST_MODE=true && npm run setMainEnvs && npm run copyBinaries && npm run pullLibs && npm run build:prod && electron-builder --linux", "distWin": "set SOURCE_PATH=win32 TEST_MODE=true && npm run copyBinariesWin && npm run build:prod && electron-builder --win", "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix", From 3db3344101e79a53f057e154f3ef49bd67a6141b Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 16:41:11 +0100 Subject: [PATCH 27/74] jsign --- .github/workflows/e2e-crossplatform.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 7d52b2b664..9b58619555 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -141,10 +141,14 @@ jobs: # uses: ./.github/actions/before-build # with: # source-path: win32 + - name: "Fetch jsign" + shell: bash + run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar - name: Build App Image working-directory: ./packages/desktop run: npm run distWin + shell: bash - name: Build App Image working-directory: ./packages/desktop From 9d5abda55ad6a4d3b3de13290b2ddd1ccd460c45 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 17:05:08 +0100 Subject: [PATCH 28/74] add steps for windows --- .github/workflows/e2e-crossplatform.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 9b58619555..bca5fdd764 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -145,6 +145,17 @@ jobs: shell: bash run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar + - name: "Add Windows certificate" + id: write_file + uses: timheuer/base64-to-file@v1.0.3 + with: + fileName: 'win-certificate.pfx' + encodedString: ${{ secrets.WIN_CSC_LINK }} + + - name: "Remove test files workaround (jest types conflicting with cypress types)" + run: find packages/desktop/src -name '*.test.*' -delete + shell: bash + - name: Build App Image working-directory: ./packages/desktop run: npm run distWin @@ -152,7 +163,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distWin && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV + run: npm run distWin && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME shell: bash - name: Chmod From 631b0031397928bccd3e7cc5e2618f63eb1053c0 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Wed, 22 Mar 2023 17:49:14 +0100 Subject: [PATCH 29/74] windows before-build --- .github/workflows/e2e-crossplatform.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index bca5fdd764..936b352a7a 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -156,9 +156,21 @@ jobs: run: find packages/desktop/src -name '*.test.*' -delete shell: bash + + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: win32 + + + # - name: Build App Image + # working-directory: ./packages/desktop + # run: npm run distWin + # shell: bash + - name: Build App Image working-directory: ./packages/desktop - run: npm run distWin + run: node_modules/.bin/electron-builder --win shell: bash - name: Build App Image From 2c620fd9085188239178eab2c37c7df83eb3e73e Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 09:01:20 +0100 Subject: [PATCH 30/74] add envs for windows --- .github/workflows/e2e-crossplatform.yml | 9 +++++++-- packages/e2e-tests/crossplatform.utils.ts | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 936b352a7a..c962e6bdf7 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -168,14 +168,19 @@ jobs: # run: npm run distWin # shell: bash - - name: Build App Image + - name: electron-builder + env: + CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} + WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }} + # USE_HARD_LINKS: false working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --win shell: bash - name: Build App Image working-directory: ./packages/desktop - run: npm run distWin && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME shell: bash - name: Chmod diff --git a/packages/e2e-tests/crossplatform.utils.ts b/packages/e2e-tests/crossplatform.utils.ts index f2481dfb84..a8fcb927d0 100644 --- a/packages/e2e-tests/crossplatform.utils.ts +++ b/packages/e2e-tests/crossplatform.utils.ts @@ -16,7 +16,6 @@ export class BuildSetup { } private getBinaryLocation() { - console.log('!@!@@!@!@!@@@!@!@@@!@!!!@@@@@@@@@@@@@', `${__dirname}/Quiet/${process.env.FILE_NAME}`) switch (process.platform) { case 'linux': return `${__dirname}/Quiet/${process.env.FILE_NAME}` From 624f35614afa4f8947e4f464d42c8709cbe58c3d Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 11:52:27 +0100 Subject: [PATCH 31/74] extra steps windows --- .github/workflows/e2e-crossplatform.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index c962e6bdf7..41bd7ce1cd 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -178,9 +178,20 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - - name: Build App Image + # - name: file name + # working-directory: ./packages/desktop + # run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV + # shell: bash + + # - name: file name echo + # working-directory: ./packages/desktop + # run: echo $FILE_NAME + # shell: bash + + + - name: extra steps working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(npm run version) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME shell: bash - name: Chmod From 73195d895fc558353fa02fa5f60381800fc72ba4 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 12:02:18 +0100 Subject: [PATCH 32/74] notarize return --- packages/desktop/scripts/notarize.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/desktop/scripts/notarize.js b/packages/desktop/scripts/notarize.js index 2e57632556..11ef199d8f 100644 --- a/packages/desktop/scripts/notarize.js +++ b/packages/desktop/scripts/notarize.js @@ -1,6 +1,8 @@ +/* eslint-disable no-unreachable */ const { notarize } = require('electron-notarize') exports.default = async function notarizing (context) { + return const { electronPlatformName, appOutDir } = context if (electronPlatformName !== 'darwin') { console.log('skipping notarization') From 689e64cf2fbb60d968b72de2bf9baf838f4a4149 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 12:18:46 +0100 Subject: [PATCH 33/74] check windows without cp --- .github/workflows/e2e-crossplatform.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 41bd7ce1cd..3512f3d6a1 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -191,9 +191,14 @@ jobs: - name: extra steps working-directory: ./packages/desktop - run: VERSION=$(npm run version) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(npm run version) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV && export FILE_NAME=$FILE_NAME shell: bash + - name: file name echo + working-directory: ./packages/desktop + run: echo $FILE_NAME + shell: bash + - name: Chmod working-directory: ./packages/desktop/dist run: chmod +x $FILE_NAME From 0faa4df5da59eb789d4db298ba11cd651bb05cb0 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 12:27:35 +0100 Subject: [PATCH 34/74] before build for mac --- .github/workflows/e2e-crossplatform.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 3512f3d6a1..af6919ea66 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -21,18 +21,18 @@ jobs: cachePrefix: "e2e-crossplatform-mac" bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - # - name: Before build - # uses: ./.github/actions/before-build - # with: - # source-path: darwin + - name: Before build + uses: ./.github/actions/before-build + with: + source-path: darwin - name: Build App Image working-directory: ./packages/desktop - run: npm run dist + run: node_modules/.bin/electron-builder --mac - name: Extra steps working-directory: ./packages/desktop - run: npm run dist && VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME # - name: Chmod # working-directory: ./packages/e2e-tests/Quiet @@ -198,7 +198,7 @@ jobs: working-directory: ./packages/desktop run: echo $FILE_NAME shell: bash - + - name: Chmod working-directory: ./packages/desktop/dist run: chmod +x $FILE_NAME From 47ca8f4e54a2df04614cc6f38b44ea34613314dd Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 13:33:07 +0100 Subject: [PATCH 35/74] file_name --- .github/workflows/e2e-crossplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index af6919ea66..f7c13b6542 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -32,7 +32,7 @@ jobs: - name: Extra steps working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet # - name: Chmod # working-directory: ./packages/e2e-tests/Quiet @@ -191,7 +191,7 @@ jobs: - name: extra steps working-directory: ./packages/desktop - run: VERSION=$(npm run version) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV && export FILE_NAME=$FILE_NAME + run: VERSION=$(npm run version) && cd dist && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet shell: bash - name: file name echo From 88c0f5a64b14c89fd322507254d951b3391a5287 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 13:47:43 +0100 Subject: [PATCH 36/74] not in dist --- .github/workflows/e2e-crossplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f7c13b6542..90db004210 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -32,7 +32,7 @@ jobs: - name: Extra steps working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && cd dist && echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet + run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV && cp $FILE_NAME ../e2e-tests/Quiet # - name: Chmod # working-directory: ./packages/e2e-tests/Quiet @@ -191,7 +191,7 @@ jobs: - name: extra steps working-directory: ./packages/desktop - run: VERSION=$(npm run version) && cd dist && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet + run: VERSION=$(npm run version) && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../e2e-tests/Quiet shell: bash - name: file name echo From e66e8fc9aae3a06cb6f795069e5b4fa7310da9b5 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 13:48:37 +0100 Subject: [PATCH 37/74] test ls --- .github/workflows/e2e-crossplatform.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 90db004210..502a31da24 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -30,6 +30,14 @@ jobs: working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --mac + - name: LS + working-directory: ./packages/desktop + run: ls + + - name: LS dist + working-directory: ./packages/desktop/dist + run: ls + - name: Extra steps working-directory: ./packages/desktop run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV && cp $FILE_NAME ../e2e-tests/Quiet From 628ca8af50731e83174e7f3aa8d31b602856d9d6 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 14:13:58 +0100 Subject: [PATCH 38/74] fix install process for windows and mac --- .github/workflows/e2e-crossplatform.yml | 48 ++++++++++--------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 502a31da24..3bb2f8545d 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -30,28 +30,24 @@ jobs: working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --mac - - name: LS + - name: VERSION env working-directory: ./packages/desktop - run: ls + run: echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV - - name: LS dist + - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: ls + run: echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV - - name: Extra steps - working-directory: ./packages/desktop - run: VERSION=$(jq -r ".version" package.json) && echo "VERSION=$(jq -r ".version" package.json)" >> $GITHUB_ENV && echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV && cp $FILE_NAME ../e2e-tests/Quiet - - # - name: Chmod - # working-directory: ./packages/e2e-tests/Quiet - # run: chmod +x Quiet-1.1.0.dmg + # - name: Copy DMG to e2e folder + # working-directory: ./packages/desktop/dist + # run: cp $FILE_NAME ../../e2e-tests/Quiet - name: Chmod - working-directory: ./packages/e2e-tests/Quiet + working-directory: ./packages/desktop/dist run: chmod +x $FILE_NAME - name: Mount installer file in volume on system - working-directory: ./packages/e2e-tests/Quiet + working-directory: ./packages/desktop/dist run: hdiutil mount $FILE_NAME - name: Add App file to applications @@ -170,40 +166,34 @@ jobs: with: source-path: win32 - - # - name: Build App Image - # working-directory: ./packages/desktop - # run: npm run distWin - # shell: bash - - name: electron-builder env: CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }} - # USE_HARD_LINKS: false working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --win shell: bash - # - name: file name - # working-directory: ./packages/desktop - # run: VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep "Setup.$VERSION.exe") && echo "FILE_NAME=$(ls | grep "Setup.$VERSION.exe")" >> $GITHUB_ENV - # shell: bash - # - name: file name echo + # - name: extra steps # working-directory: ./packages/desktop - # run: echo $FILE_NAME + # run: VERSION=$(npm run version) && cd dist && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet # shell: bash - - name: extra steps + - name: VERSION env working-directory: ./packages/desktop - run: VERSION=$(npm run version) && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../e2e-tests/Quiet + run: echo "VERSION=$(npm run version)" >> $GITHUB_ENV + shell: bash + + - name: FILE_NAME env + working-directory: ./packages/desktop/dist + run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV shell: bash - name: file name echo - working-directory: ./packages/desktop + working-directory: ./packages/desktop/dist run: echo $FILE_NAME shell: bash From 149d2e9e0acc66a0215fff864613f22972fbd592 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 15:00:08 +0100 Subject: [PATCH 39/74] powershell for windows --- .github/workflows/e2e-crossplatform.yml | 26 ++++++++----------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 3bb2f8545d..c56c653628 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -38,10 +38,6 @@ jobs: working-directory: ./packages/desktop/dist run: echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV - # - name: Copy DMG to e2e folder - # working-directory: ./packages/desktop/dist - # run: cp $FILE_NAME ../../e2e-tests/Quiet - - name: Chmod working-directory: ./packages/desktop/dist run: chmod +x $FILE_NAME @@ -67,8 +63,6 @@ jobs: max_attempts: 3 command: cd packages/e2e-tests && npm run test newUser.crossplatform.test.ts - - linux: runs-on: ${{ matrix.os }} @@ -141,10 +135,6 @@ jobs: cachePrefix: "e2e-crossplatform-windows" bootstrap-packages: "@quiet/logger,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" - # - name: Before build - # uses: ./.github/actions/before-build - # with: - # source-path: win32 - name: "Fetch jsign" shell: bash run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar @@ -184,18 +174,18 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=$(npm run version)" >> $GITHUB_ENV - shell: bash + run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV - shell: bash + run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - - name: file name echo - working-directory: ./packages/desktop/dist - run: echo $FILE_NAME - shell: bash + # - name: file name echo + # working-directory: ./packages/desktop/dist + # run: echo $FILE_NAME + # shell: bash - name: Chmod working-directory: ./packages/desktop/dist From 22dce54a979de2e2d24f0a7b352deb3e6b5c2092 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 15:04:41 +0100 Subject: [PATCH 40/74] chmod for windows off --- .github/workflows/e2e-crossplatform.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index c56c653628..ae272e7d98 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -187,10 +187,10 @@ jobs: # run: echo $FILE_NAME # shell: bash - - name: Chmod - working-directory: ./packages/desktop/dist - run: chmod +x $FILE_NAME - shell: bash + # - name: Chmod + # working-directory: ./packages/desktop/dist + # run: chmod +x $FILE_NAME + # shell: bash - name: Install exe run: Start-Process $FILE_NAME -Wait From 99c13d8b1d1c9e76b4fc6f4b4c80d2f8365d6e61 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 15:35:10 +0100 Subject: [PATCH 41/74] harcoded file name --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index ae272e7d98..4027340f51 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -179,7 +179,7 @@ jobs: - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "FILE_NAME="Quiet.Setup.1.1.1-alpha.0.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell # - name: file name echo From 20fc35ab9184f775dca9987395027c1243afe61c Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 15:37:05 +0100 Subject: [PATCH 42/74] envs in one line --- .github/workflows/e2e-crossplatform.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 4027340f51..5de028a9f7 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -174,13 +174,13 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append & echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - - name: FILE_NAME env - working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet.Setup.1.1.1-alpha.0.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell + # - name: FILE_NAME env + # working-directory: ./packages/desktop/dist + # run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell # - name: file name echo # working-directory: ./packages/desktop/dist From b5da6756b04930fa6f2d83982991609e1faf1bc5 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 15:50:27 +0100 Subject: [PATCH 43/74] format command --- .github/workflows/e2e-crossplatform.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 5de028a9f7..ad38b2c469 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -174,13 +174,13 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append & echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - # - name: FILE_NAME env - # working-directory: ./packages/desktop/dist - # run: echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell + - name: FILE_NAME env + working-directory: ./packages/desktop/dist + run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell # - name: file name echo # working-directory: ./packages/desktop/dist From e123bf811e639fb7657c30256298f1099a009786 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 16:20:04 +0100 Subject: [PATCH 44/74] get version in powershell --- .github/workflows/e2e-crossplatform.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index ad38b2c469..13c57f3a9b 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -150,7 +150,6 @@ jobs: run: find packages/desktop/src -name '*.test.*' -delete shell: bash - - name: Before build uses: ./.github/actions/before-build with: @@ -165,16 +164,9 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - - # - name: extra steps - # working-directory: ./packages/desktop - # run: VERSION=$(npm run version) && cd dist && FILE_NAME="Quiet.Setup.$VERSION.exe" && echo "FILE_NAME="Quiet.Setup.$VERSION.exe"" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet - # shell: bash - - - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=$(npm run version)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: FILE_NAME env @@ -182,16 +174,6 @@ jobs: run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - # - name: file name echo - # working-directory: ./packages/desktop/dist - # run: echo $FILE_NAME - # shell: bash - - # - name: Chmod - # working-directory: ./packages/desktop/dist - # run: chmod +x $FILE_NAME - # shell: bash - - name: Install exe run: Start-Process $FILE_NAME -Wait working-directory: ./packages/desktop/dist From 99493385f59bf49206c3e590628dfbf318b290cf Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 17:41:36 +0100 Subject: [PATCH 45/74] format version env --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 13c57f3a9b..dec11e9e67 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -166,7 +166,7 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: FILE_NAME env From 65fc9ab65392fe10e2523c865f759c0f7176ef55 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 20:27:40 +0100 Subject: [PATCH 46/74] only echo --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index dec11e9e67..6f8896c996 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -166,7 +166,7 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" shell: powershell - name: FILE_NAME env From b3f6186f09882d9dfdf3dbd99f853a410277b434 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 23 Mar 2023 20:31:12 +0100 Subject: [PATCH 47/74] other combination --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 6f8896c996..0f868c5ebe 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -166,7 +166,7 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" + run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" & Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: FILE_NAME env From 6da07c5c8902c586a1d5c4345c57d2ad550d28a1 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 07:47:56 +0100 Subject: [PATCH 48/74] hardcoded version --- .github/workflows/e2e-crossplatform.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 0f868c5ebe..fb94949940 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,18 +164,18 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - - name: VERSION env - working-directory: ./packages/desktop - run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" & Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell + # - name: VERSION env + # working-directory: ./packages/desktop + # run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" & Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell - - name: FILE_NAME env - working-directory: ./packages/desktop/dist - run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell + # - name: FILE_NAME env + # working-directory: ./packages/desktop/dist + # run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell - name: Install exe - run: Start-Process $FILE_NAME -Wait + run: Start-Process Quiet.Setup.1.1.1-alpha.0.exe -Wait working-directory: ./packages/desktop/dist shell: powershell From 85d4ef51e01f95563547f79c3b86b5117182de2d Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 08:29:13 +0100 Subject: [PATCH 49/74] test version --- .github/workflows/e2e-crossplatform.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index fb94949940..6759ebcd93 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,18 +164,18 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - # - name: VERSION env - # working-directory: ./packages/desktop - # run: echo VERSION=(Get-Content package.json) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" & Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell + - name: VERSION env + working-directory: ./packages/desktop + run: echo VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - # - name: FILE_NAME env - # working-directory: ./packages/desktop/dist - # run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell + - name: FILE_NAME env + working-directory: ./packages/desktop/dist + run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - name: Install exe - run: Start-Process Quiet.Setup.1.1.1-alpha.0.exe -Wait + run: Start-Process $FILE_NAME -Wait working-directory: ./packages/desktop/dist shell: powershell From d250c03d7898098782011ce9df7ca3a407d05c92 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 08:31:22 +0100 Subject: [PATCH 50/74] test version 2 --- .github/workflows/e2e-crossplatform.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 6759ebcd93..103ff51634 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,6 +164,11 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash + - name: VERSION env 2 + working-directory: ./packages/desktop + run: echo %npm_package_version% + shell: powershell + - name: VERSION env working-directory: ./packages/desktop run: echo VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append From e86ab2e2dc140a0e5bbabf30b475c1b1f24917e1 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 08:33:18 +0100 Subject: [PATCH 51/74] add dirs --- .github/workflows/e2e-crossplatform.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 103ff51634..d2daf8add5 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,6 +164,16 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash + - name: dir1 + working-directory: ./packages/desktop + run: dir + shell: powershell + + - name: dir dist + working-directory: ./packages/desktop/dist + run: dir + shell: powershell + - name: VERSION env 2 working-directory: ./packages/desktop run: echo %npm_package_version% From 34a4b9c6b9c20847c1fa237ceb08c3ab9846044b Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 08:50:58 +0100 Subject: [PATCH 52/74] harcoded version --- .github/workflows/e2e-crossplatform.yml | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index d2daf8add5..1d3f630f60 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,33 +164,33 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - - name: dir1 - working-directory: ./packages/desktop - run: dir - shell: powershell - - - name: dir dist - working-directory: ./packages/desktop/dist - run: dir - shell: powershell - - - name: VERSION env 2 - working-directory: ./packages/desktop - run: echo %npm_package_version% - shell: powershell - - - name: VERSION env - working-directory: ./packages/desktop - run: echo VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell - - - name: FILE_NAME env - working-directory: ./packages/desktop/dist - run: echo "FILE_NAME=Quiet.Setup.$VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell + # - name: dir1 + # working-directory: ./packages/desktop + # run: dir + # shell: powershell + + # - name: dir dist + # working-directory: ./packages/desktop/dist + # run: dir + # shell: powershell + + # - name: VERSION env 2 + # working-directory: ./packages/desktop + # run: echo %npm_package_version% + # shell: powershell + + # - name: VERSION env + # working-directory: ./packages/desktop + # run: echo VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell + + # - name: FILE_NAME env + # working-directory: ./packages/desktop/dist + # run: echo "FILE_NAME=Quiet Setup $VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell - name: Install exe - run: Start-Process $FILE_NAME -Wait + run: Start-Process Quiet Setup 1.1.1-alpha.0.exe -Wait working-directory: ./packages/desktop/dist shell: powershell From 9bcc2e3e728fd8f2f40fa3c8bc218b12792e3dfc Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 09:17:52 +0100 Subject: [PATCH 53/74] add chmod --- .github/workflows/e2e-crossplatform.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 1d3f630f60..32c8968074 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -189,8 +189,13 @@ jobs: # run: echo "FILE_NAME=Quiet Setup $VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append # shell: powershell + - name: Chmod + working-directory: ./packages/desktop/dist + run: chmod +x "Quiet Setup 1.1.1-alpha.0.exe" + shell: bash + - name: Install exe - run: Start-Process Quiet Setup 1.1.1-alpha.0.exe -Wait + run: Start-Process "Quiet Setup 1.1.1-alpha.0.exe" -Wait working-directory: ./packages/desktop/dist shell: powershell From 10a2f09cbe1acab69946478587d5ad456dda6932 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 09:18:45 +0100 Subject: [PATCH 54/74] version env --- .github/workflows/e2e-crossplatform.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 32c8968074..58dfbfedc0 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -179,15 +179,15 @@ jobs: # run: echo %npm_package_version% # shell: powershell - # - name: VERSION env - # working-directory: ./packages/desktop - # run: echo VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell + - name: VERSION env + working-directory: ./packages/desktop + run: echo "VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - # - name: FILE_NAME env - # working-directory: ./packages/desktop/dist - # run: echo "FILE_NAME=Quiet Setup $VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell + - name: FILE_NAME env + working-directory: ./packages/desktop/dist + run: echo "FILE_NAME=Quiet Setup $VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + shell: powershell - name: Chmod working-directory: ./packages/desktop/dist From d057f505ce74b6e67e344c117bb99ed141369cc6 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 09:19:16 +0100 Subject: [PATCH 55/74] change version env --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 58dfbfedc0..7d77eb5d38 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -181,7 +181,7 @@ jobs: - name: VERSION env working-directory: ./packages/desktop - run: echo "VERSION=(Get-Content -Raw -Path package.json | ConvertFrom-JSON).version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=%npm_package_version%" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: FILE_NAME env From b4cd8eff5f56780892da579bf59ca9b0096b5545 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 09:27:29 +0100 Subject: [PATCH 56/74] use extract package --- .github/workflows/e2e-crossplatform.yml | 32 +++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 7d77eb5d38..a460bf235c 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -179,23 +179,41 @@ jobs: # run: echo %npm_package_version% # shell: powershell - - name: VERSION env - working-directory: ./packages/desktop - run: echo "VERSION=%npm_package_version%" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - shell: powershell + + - name: Extract version + id: extract_version + uses: Saionaro/extract-package-version@v1.1.1 + with: + path: packages/desktop + + - name: Print version + run: echo ${{ steps.extract_version.outputs.version }} + + + # - name: VERSION env + # working-directory: ./packages/desktop + # run: echo "VERSION=%npm_package_version%" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + # shell: powershell - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME=Quiet Setup $VERSION.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell + + - name: echo FILE_NAME + working-directory: ./packages/desktop/dist + run: echo $FILE_NAME + shell: bash + + - name: Chmod working-directory: ./packages/desktop/dist - run: chmod +x "Quiet Setup 1.1.1-alpha.0.exe" + run: chmod +x $FILE_NAME shell: bash - name: Install exe - run: Start-Process "Quiet Setup 1.1.1-alpha.0.exe" -Wait + run: Start-Process $FILE_NAME -Wait working-directory: ./packages/desktop/dist shell: powershell From 7176afa2de4d8406eed52cc5e43058ccca9a4002 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 09:48:27 +0100 Subject: [PATCH 57/74] format commands --- .github/workflows/e2e-crossplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index a460bf235c..55fcc1b310 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -209,11 +209,11 @@ jobs: - name: Chmod working-directory: ./packages/desktop/dist - run: chmod +x $FILE_NAME + run: chmod +x "$FILE_NAME" shell: bash - name: Install exe - run: Start-Process $FILE_NAME -Wait + run: Start-Process "$FILE_NAME" -Wait working-directory: ./packages/desktop/dist shell: powershell From 61894094a904fc77303d0e95bdb853e89ae44280 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 10:04:05 +0100 Subject: [PATCH 58/74] fix install command --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 55fcc1b310..23aa35eddf 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -213,7 +213,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process "$FILE_NAME" -Wait + run: Start-Process $FILE_NAME -Wait working-directory: ./packages/desktop/dist shell: powershell From 81c2c07045216bd16581a57fe36065665d779606 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 10:06:05 +0100 Subject: [PATCH 59/74] format install command --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 23aa35eddf..2c45c49ddc 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -213,7 +213,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process $FILE_NAME -Wait + run: Start-Process "$($FILE_NAME)" -Wait working-directory: ./packages/desktop/dist shell: powershell From 10e63bfb424c36831dfb19e75c0499bcdf8ec30e Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 10:31:53 +0100 Subject: [PATCH 60/74] change command syntax --- .github/workflows/e2e-crossplatform.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 2c45c49ddc..4475a3b97e 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -164,21 +164,6 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - # - name: dir1 - # working-directory: ./packages/desktop - # run: dir - # shell: powershell - - # - name: dir dist - # working-directory: ./packages/desktop/dist - # run: dir - # shell: powershell - - # - name: VERSION env 2 - # working-directory: ./packages/desktop - # run: echo %npm_package_version% - # shell: powershell - - name: Extract version id: extract_version @@ -189,31 +174,23 @@ jobs: - name: Print version run: echo ${{ steps.extract_version.outputs.version }} - - # - name: VERSION env - # working-directory: ./packages/desktop - # run: echo "VERSION=%npm_package_version%" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - # shell: powershell - - name: FILE_NAME env working-directory: ./packages/desktop/dist run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - - name: echo FILE_NAME working-directory: ./packages/desktop/dist run: echo $FILE_NAME shell: bash - - name: Chmod working-directory: ./packages/desktop/dist run: chmod +x "$FILE_NAME" shell: bash - name: Install exe - run: Start-Process "$($FILE_NAME)" -Wait + run: Start-Process ${FILE_NAME} -Wait working-directory: ./packages/desktop/dist shell: powershell From 8d1588328efd8a66fb712e8f3d55824729a28621 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 11:36:18 +0100 Subject: [PATCH 61/74] format file name --- .github/workflows/e2e-crossplatform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 4475a3b97e..94ade36419 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -176,7 +176,7 @@ jobs: - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "FILE_NAME="Quiet Setup ${{ steps.extract_version.outputs.version }}.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: echo FILE_NAME @@ -186,11 +186,11 @@ jobs: - name: Chmod working-directory: ./packages/desktop/dist - run: chmod +x "$FILE_NAME" + run: chmod +x $FILE_NAME shell: bash - name: Install exe - run: Start-Process ${FILE_NAME} -Wait + run: Start-Process $FILE_NAME -Wait working-directory: ./packages/desktop/dist shell: powershell From 041f48781d809f106f916f6516bdbd19c474c769 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 11:59:21 +0100 Subject: [PATCH 62/74] to string --- .github/workflows/e2e-crossplatform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 94ade36419..37db8a8f7d 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -176,7 +176,7 @@ jobs: - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet Setup ${{ steps.extract_version.outputs.version }}.exe"" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - name: echo FILE_NAME @@ -186,11 +186,11 @@ jobs: - name: Chmod working-directory: ./packages/desktop/dist - run: chmod +x $FILE_NAME + run: chmod +x "$FILE_NAME" shell: bash - name: Install exe - run: Start-Process $FILE_NAME -Wait + run: Start-Process $FILE_NAME.toString() -Wait working-directory: ./packages/desktop/dist shell: powershell From 8759a09ed8680b36a0992e69b31e0a0ce32cac39 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:16:52 +0100 Subject: [PATCH 63/74] change install command --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 37db8a8f7d..f3a7fa03c1 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,7 +190,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process $FILE_NAME.toString() -Wait + run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait working-directory: ./packages/desktop/dist shell: powershell From 2a90ac5ca1f4ffa8c6917493645c9f0cf7adb24d Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:18:59 +0100 Subject: [PATCH 64/74] install v2 --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f3a7fa03c1..cb50976c8a 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,7 +190,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait + run: Start-Process '$FILE_NAME' -Wait working-directory: ./packages/desktop/dist shell: powershell From 06ee93a88fbaf10703dd10b5c8d10668828aabfa Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:20:19 +0100 Subject: [PATCH 65/74] install v3 --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index cb50976c8a..d8ef40c30a 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,7 +190,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process '$FILE_NAME' -Wait + run: Start-Process "$FILE_NAME" -Wait working-directory: ./packages/desktop/dist shell: powershell From c1636e2db709c4624bc9fa74fb74d9455c444030 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:21:30 +0100 Subject: [PATCH 66/74] install v4 --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index d8ef40c30a..113a07aa38 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,7 +190,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process "$FILE_NAME" -Wait + run: Start-Process "$($FILE_NAME)" -Wait working-directory: ./packages/desktop/dist shell: powershell From 442e9dcf2bb182ba9f074dbf3413b8859af5e360 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:22:28 +0100 Subject: [PATCH 67/74] install v5 --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 113a07aa38..d393be0f5c 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,7 +190,7 @@ jobs: shell: bash - name: Install exe - run: Start-Process "$($FILE_NAME)" -Wait + run: Start-Process "${FILE_NAME}" -Wait working-directory: ./packages/desktop/dist shell: powershell From f87a8636835121f1c70c65c00d8ec9c66b348268 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 12:51:52 +0100 Subject: [PATCH 68/74] back to working version --- .github/workflows/e2e-crossplatform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index d393be0f5c..f7042f3154 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -190,12 +190,13 @@ jobs: shell: bash - name: Install exe - run: Start-Process "${FILE_NAME}" -Wait + run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait working-directory: ./packages/desktop/dist shell: powershell - name: Kill exe run: Stop-Process -Name "Quiet" -Force + working-directory: ./packages/desktop/dist shell: powershell - name: Run smoke test From 4f822fb4206daf0f56f69ba0379e96f7c5c161ee Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 13:17:32 +0100 Subject: [PATCH 69/74] cleanup --- .github/workflows/e2e-crossplatform.yml | 12 ++---------- packages/desktop/package.json | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f7042f3154..40599e52c3 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -75,6 +75,7 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 DISPLAY: ":99.0" + TEST_MODE: true steps: - uses: actions/checkout@v2 @@ -99,7 +100,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet - name: Chmod working-directory: ./packages/e2e-tests/Quiet @@ -164,26 +165,17 @@ jobs: run: node_modules/.bin/electron-builder --win shell: bash - - name: Extract version id: extract_version uses: Saionaro/extract-package-version@v1.1.1 with: path: packages/desktop - - name: Print version - run: echo ${{ steps.extract_version.outputs.version }} - - name: FILE_NAME env working-directory: ./packages/desktop/dist run: echo "FILE_NAME=Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append shell: powershell - - name: echo FILE_NAME - working-directory: ./packages/desktop/dist - run: echo $FILE_NAME - shell: bash - - name: Chmod working-directory: ./packages/desktop/dist run: chmod +x "$FILE_NAME" diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 6fce4730fe..daea0300ae 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -86,9 +86,9 @@ "pullBinaries": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/tor -P ./tor/ && chmod 775 ./tor/tor", "pullLibs": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/libssl.so -P ./ && chmod 775 ./libssl.so", "pullBinariesWin": "wget -N https://zbay-binaries.s3.us-east-2.amazonaws.com/$SOURCE_PATH/tor.exe -P ./tor/ && chmod 775 ./tor/tor.exe", - "dist": "export SOURCE_PATH=darwin TEST_MODE=true && npm run copyBinaries && npm run build:prod && electron-builder --mac", + "dist": "export SOURCE_PATH=darwin && npm run copyBinaries && npm run build:prod && electron-builder --mac", "distUbuntu": "export SOURCE_PATH=linux TEST_MODE=true && npm run setMainEnvs && npm run copyBinaries && npm run pullLibs && npm run build:prod && electron-builder --linux", - "distWin": "set SOURCE_PATH=win32 TEST_MODE=true && npm run copyBinariesWin && npm run build:prod && electron-builder --win", + "distwin": "export SOURCE_PATH=win32 && npm run copyBinariesWin && npm run build:prod && electron-builder --win", "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix", "lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/", "type-check": "tsc -p tsconfig.build.json --noEmit", From 4fcc1c430bd1cc31d77332f435f49f24caaae3bf Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 13:24:29 +0100 Subject: [PATCH 70/74] fix linux --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 40599e52c3..b538d47f7f 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -100,7 +100,7 @@ jobs: - name: Build App Image working-directory: ./packages/desktop - run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet + run: npm run distUbuntu && VERSION=$(jq -r ".version" package.json) && cd dist && FILE_NAME=$(ls | grep $VERSION) && echo "FILE_NAME=$(ls | grep $VERSION)" >> $GITHUB_ENV && cp $FILE_NAME ../../e2e-tests/Quiet && export FILE_NAME=$FILE_NAME - name: Chmod working-directory: ./packages/e2e-tests/Quiet From 000ed45fe5ba4215d92a8abfaf3e56573c2775da Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 13:49:02 +0100 Subject: [PATCH 71/74] env in notarize --- .github/workflows/e2e-crossplatform.yml | 1 + packages/desktop/scripts/notarize.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index b538d47f7f..f5c22fcc1c 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -11,6 +11,7 @@ jobs: env: ELECTRON_CUSTOM_VERSION: 23.0.0 TEST_MODE: true + IS_E2E: true steps: - uses: actions/checkout@v2 diff --git a/packages/desktop/scripts/notarize.js b/packages/desktop/scripts/notarize.js index 11ef199d8f..a4d2242c9a 100644 --- a/packages/desktop/scripts/notarize.js +++ b/packages/desktop/scripts/notarize.js @@ -2,9 +2,8 @@ const { notarize } = require('electron-notarize') exports.default = async function notarizing (context) { - return const { electronPlatformName, appOutDir } = context - if (electronPlatformName !== 'darwin') { + if (electronPlatformName !== 'darwin' || process.env.IS_E2E) { console.log('skipping notarization') return } From dce5818123986ed5a1ede0cfefdd730fb732fbeb Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 14:18:36 +0100 Subject: [PATCH 72/74] try without certificate --- .github/workflows/e2e-crossplatform.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f5c22fcc1c..93617c5f90 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -141,12 +141,12 @@ jobs: shell: bash run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar - - name: "Add Windows certificate" - id: write_file - uses: timheuer/base64-to-file@v1.0.3 - with: - fileName: 'win-certificate.pfx' - encodedString: ${{ secrets.WIN_CSC_LINK }} + # - name: "Add Windows certificate" + # id: write_file + # uses: timheuer/base64-to-file@v1.0.3 + # with: + # fileName: 'win-certificate.pfx' + # encodedString: ${{ secrets.WIN_CSC_LINK }} - name: "Remove test files workaround (jest types conflicting with cypress types)" run: find packages/desktop/src -name '*.test.*' -delete @@ -160,7 +160,7 @@ jobs: - name: electron-builder env: CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }} - WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} + # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }} working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --win From 019a9076b63bc8fb0f6934990c7f805ecef68d39 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 14:32:11 +0100 Subject: [PATCH 73/74] restore certificate --- .github/workflows/e2e-crossplatform.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 93617c5f90..f5c22fcc1c 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -141,12 +141,12 @@ jobs: shell: bash run: cd packages/desktop && curl https://zbay-binaries.s3.us-east-2.amazonaws.com/jsign/jsign-2.1.jar --output ./jsign-2.1.jar - # - name: "Add Windows certificate" - # id: write_file - # uses: timheuer/base64-to-file@v1.0.3 - # with: - # fileName: 'win-certificate.pfx' - # encodedString: ${{ secrets.WIN_CSC_LINK }} + - name: "Add Windows certificate" + id: write_file + uses: timheuer/base64-to-file@v1.0.3 + with: + fileName: 'win-certificate.pfx' + encodedString: ${{ secrets.WIN_CSC_LINK }} - name: "Remove test files workaround (jest types conflicting with cypress types)" run: find packages/desktop/src -name '*.test.*' -delete @@ -160,7 +160,7 @@ jobs: - name: electron-builder env: CERTIFICATE_PATH: ${{ steps.write_file.outputs.filePath }} - # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} WINDOWS_ALIAS: ${{ secrets.WIN_ALIAS }} working-directory: ./packages/desktop run: node_modules/.bin/electron-builder --win From cc50c3e34925e45aca68b8e24d3508a5fa9a5f63 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Fri, 24 Mar 2023 14:54:00 +0100 Subject: [PATCH 74/74] use Quiet base64-to-file --- .github/workflows/e2e-crossplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index f5c22fcc1c..4a145b9243 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -143,7 +143,7 @@ jobs: - name: "Add Windows certificate" id: write_file - uses: timheuer/base64-to-file@v1.0.3 + uses: TryQuiet/base64-to-file@main with: fileName: 'win-certificate.pfx' encodedString: ${{ secrets.WIN_CSC_LINK }}