From a7ba03e92cd98ea9fa015dc2660074425aeca5ea Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Thu, 24 Nov 2022 15:26:43 +0100 Subject: [PATCH] chore: remove touchbar support chore: force install python chore: try running macos earlier version chore: remove manual py install chore: use macOS11 integration tests chore: use set ubuntu to fixed test version chore: update publish script ci: try newer node version --- .github/workflows/audit.yml | 4 +++- .github/workflows/create-version.yml | 10 ++++----- .github/workflows/debug-build.yml | 26 ++++++++++++++---------- .github/workflows/exact-versions.yml | 4 +++- .github/workflows/gh-pages.yml | 5 ++--- .github/workflows/integration-tests.yml | 12 +++++------ .github/workflows/publish-version.yml | 22 +++++++++----------- .github/workflows/typecheck.yml | 4 ++-- app/main.dev.ts | 3 --- app/tests/features/onboarding.feature.ts | 1 - 10 files changed, 45 insertions(+), 46 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 1ae5af994..dc743b31e 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -15,7 +15,9 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 + with: + node-version: 14 - name: Cache node_modules uses: actions/cache@v2 diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml index 8f5208aab..2787ecfc2 100644 --- a/.github/workflows/create-version.yml +++ b/.github/workflows/create-version.yml @@ -28,10 +28,9 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - - name: Use Node.js - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 14 - name: Cache node_modules id: cache @@ -63,10 +62,9 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - - name: Set up node - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 14 - name: Cache node_modules id: cache diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml index b21ed3b61..da2907dd4 100644 --- a/.github/workflows/debug-build.yml +++ b/.github/workflows/debug-build.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: announce-start: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: lucasmotta/pull-request-sticky-header@1.0.0 @@ -25,16 +25,16 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-11, ubuntu-20.04, windows-latest] stx_network: [testnet, mainnet] include: - - os: macos-latest + - os: macos-11 NPM_COMMAND: mac UPLOAD_ASSETS: release/**/*.dmg CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_APPLE CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_APPLE - - os: ubuntu-latest + - os: ubuntu-20.04 NPM_COMMAND: linux UPLOAD_ASSETS: | release/**/*.deb @@ -57,7 +57,7 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Import GPG key id: import_gpg_key @@ -81,15 +81,19 @@ jobs: - name: Install code-signing certs - Apple only uses: apple-actions/import-codesign-certs@v1 - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-11' with: p12-file-base64: ${{ secrets.CODE_SIGNING_CERTIFICATE_APPLE }} p12-password: ${{ secrets.CODE_SIGNING_PASSWORD_APPLE }} - - name: Setup node - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 14 + + - uses: actions/setup-python@v4 + with: + python-version: '2.7.18' + architecture: x64 # # Windows build breaks when using the package.json script to install `app/` packages @@ -135,7 +139,7 @@ jobs: path: ${{ matrix.UPLOAD_ASSETS }} asset-signatures: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: - debug-build @@ -165,7 +169,7 @@ jobs: path: shasum.txt.asc announce-completion: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: always() diff --git a/.github/workflows/exact-versions.yml b/.github/workflows/exact-versions.yml index a27a21b82..e5a6cdef1 100644 --- a/.github/workflows/exact-versions.yml +++ b/.github/workflows/exact-versions.yml @@ -10,7 +10,9 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 + with: + node-version: 14 - name: Add @actions/core uses: nick-invision/retry@v2 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 36c6b847f..029e0cf69 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -17,10 +17,9 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - - name: Set up node - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 14 - name: Cache node_modules id: cache diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index dca7dbf78..94d70cb7c 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-latest] + os: [macos-11, ubuntu-20.04] stx_network: [testnet, mainnet] steps: @@ -33,13 +33,13 @@ jobs: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }} - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 15 + node-version: 14 - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Install packages uses: nick-invision/retry@v2 @@ -78,10 +78,10 @@ jobs: run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - run: yarn test:integration - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-11' - run: xvfb-run --auto-servernum -- yarn test:integration - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - uses: actions/upload-artifact@v2 if: always() diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml index 3b3926dd2..e72d65ada 100644 --- a/.github/workflows/publish-version.yml +++ b/.github/workflows/publish-version.yml @@ -14,16 +14,16 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-10.11, ubuntu-20.04, windows-latest] stx_network: [testnet, mainnet] include: - - os: macos-latest + - os: macos-10.11 UPLOAD_ASSETS: release/**/*.dmg NPM_COMMAND: mac CSC_LINK_SECRET_NAME: CODE_SIGNING_CERTIFICATE_APPLE CSC_KEY_PASSWORD_SECRET_NAME: CODE_SIGNING_PASSWORD_APPLE - - os: ubuntu-latest + - os: ubuntu-20.04 NPM_COMMAND: linux UPLOAD_ASSETS: | release/**/*.deb @@ -50,7 +50,7 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Variables id: vars @@ -60,16 +60,14 @@ jobs: - name: Install code-signing certs - Apple only uses: apple-actions/import-codesign-certs@v1 - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-10.11' with: p12-file-base64: ${{ secrets.CODE_SIGNING_CERTIFICATE_APPLE }} p12-password: ${{ secrets.CODE_SIGNING_PASSWORD_APPLE }} - - name: Install Node.js, NPM and Yarn - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: 12 - + node-version: 14 # # Windows build breaks when using the package.json script to install `app/` packages # using separate run to install those packages separately @@ -107,7 +105,7 @@ jobs: path: ${{ matrix.UPLOAD_ASSETS }} create-release: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: - build @@ -171,7 +169,7 @@ jobs: body_path: release-body.txt upload-release-assets: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: - build - create-release @@ -210,7 +208,7 @@ jobs: asset_content_type: application/octet-stream announce-release: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_UX_NOTIFS_WEBHOOK }} diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index f5b40a152..ecbbbb74f 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -14,9 +14,9 @@ jobs: - name: Add required Linux dependencies uses: ./.github/actions/linux-deps - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: - node-version: '14' + node-version: 14 - name: Install dependencies uses: nick-invision/retry@v2 diff --git a/app/main.dev.ts b/app/main.dev.ts index d994bd222..4e5826f37 100644 --- a/app/main.dev.ts +++ b/app/main.dev.ts @@ -29,7 +29,6 @@ import { getUserDataPath } from './main/get-user-data-path'; import { registerLedgerListeners } from './main/register-ledger-listeners'; import { registerIpcStoreHandlers } from './main/register-store-handlers'; import { registerIpcContextMenuHandlers } from './main/register-context-menus'; -import { addMacOsTouchBarMenu } from './main/macos-touchbar-menu'; import { registerThemeModeHandlers } from './main/register-theme-mode-handlers'; // CSP enabled in production mode, don't warn in development @@ -156,8 +155,6 @@ const createWindow = async () => { registerThemeModeHandlers(mainWindow.webContents); registerIpcContextMenuHandlers(mainWindow); - - if (process.platform === 'darwin') addMacOsTouchBarMenu(mainWindow); }; app.on('web-contents-created', (_event, contents) => { diff --git a/app/tests/features/onboarding.feature.ts b/app/tests/features/onboarding.feature.ts index 3fa80fba2..e8e19ddf2 100644 --- a/app/tests/features/onboarding.feature.ts +++ b/app/tests/features/onboarding.feature.ts @@ -8,7 +8,6 @@ export function createOnboardingFeature(page: Page) { async findTermsOfServiceTitle() { // force top of page await repeatAction(100)(() => page.keyboard.press('Shift+Space')); - await page.screenshot({ path: 'screenshots/terms-page.png' }); const selector = 'text="Terms of Service"'; return page.$(selector); },