From 2f016f40950b2dcf8ac43e0457479c7ef3f48f0d Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 06:29:23 -0700 Subject: [PATCH 01/61] Create node.js.yml --- .github/workflows/node.js.yml | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 0000000000..8889472376 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,36 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + strategy: + matrix: + node-version: [16.x, 18.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + runs-on: [macos-latest, ubuntu-latest, windows-latest] + + runs-on: ${{ matrix.runs-on }} + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - name: Install dependencies and build + run: yarn --frozen-lockfile + - name: Unit tests + run: yarn test-unit --forbid-only + - name: Lint code + run: yarn lint + - name: Lint API + run: yarn lint-api From 6282f9ac98148a65195d45923694fb6f4badc327 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 06:34:03 -0700 Subject: [PATCH 02/61] npm -> yarn --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8889472376..9d1ebd7f1f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - cache: 'npm' + cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile - name: Unit tests From d58283fb8a7fe0ca36fb069de21ab8d2c46e95db Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 06:43:22 -0700 Subject: [PATCH 03/61] Add integration test job --- .github/workflows/node.js.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 9d1ebd7f1f..4e6bd6e410 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -11,14 +11,11 @@ on: jobs: build: - strategy: matrix: - node-version: [16.x, 18.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + node-version: [16.x, 18.x] runs-on: [macos-latest, ubuntu-latest, windows-latest] - runs-on: ${{ matrix.runs-on }} - steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -34,3 +31,21 @@ jobs: run: yarn lint - name: Lint API run: yarn lint-api + + integration-tests-chromium: + strategy: + matrix: + node-version: [18.x] + runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies and build + run: yarn --frozen-lockfile + - name: Integration tests (Chromium) + run: yarn test-api-chromium --headless --forbid-only From 64720896e6261827e41f78124908d5dd3b320b8e Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:05:40 -0700 Subject: [PATCH 04/61] Add firefox api tests --- .github/workflows/{node.js.yml => ci.yml} | 25 ++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) rename .github/workflows/{node.js.yml => ci.yml} (68%) diff --git a/.github/workflows/node.js.yml b/.github/workflows/ci.yml similarity index 68% rename from .github/workflows/node.js.yml rename to .github/workflows/ci.yml index 4e6bd6e410..43a092bcf3 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,4 @@ -# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs - -name: Node.js CI +name: CI on: push: @@ -31,7 +28,7 @@ jobs: run: yarn lint - name: Lint API run: yarn lint-api - + integration-tests-chromium: strategy: matrix: @@ -49,3 +46,21 @@ jobs: run: yarn --frozen-lockfile - name: Integration tests (Chromium) run: yarn test-api-chromium --headless --forbid-only + + integration-tests-firefox: + strategy: + matrix: + node-version: [18.x] + runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies and build + run: yarn --frozen-lockfile + - name: Integration tests (Chromium) + run: yarn test-api-firefox --headless --forbid-only From 2e87c4bca9ea714391e2a32c1d642196586fd003 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:09:20 -0700 Subject: [PATCH 05/61] Tidy up codeql.yml --- .github/workflows/codeql-analysis.yml | 72 --------------------------- .github/workflows/codeql.yml | 35 +++++++++++++ 2 files changed, 35 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index f8c8362a64..0000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,72 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '41 17 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # â„šī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..3ba91f7e95 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,35 @@ +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '41 17 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From 602da60c61e6d78457b2d0aa120deef70f964204 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:13:22 -0700 Subject: [PATCH 06/61] Add release workflow --- .github/workflows/release.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..00ef6a7454 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,29 @@ +name: Release + +on: + push: + # If a commit reaches master, assume it has passed CI via PR and publish + # without running tests to save time to publish + branches: [ "master" ] + # TODO: Remove before merge + pull_request: + branches: [ "master" ] + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Use Node.js 18.x + uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: 'yarn' + - name: Install dependencies and build + run: yarn --frozen-lockfile + - name: Package headless + run: | + yarn package-headless + node ./bin/package_headless.js + - name: Package core and publish + run: node ./bin/publish.js --dry From a24d6711f626c9dec33cd6de3caadfd7bdb655f7 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:26:56 -0700 Subject: [PATCH 07/61] Set up auth --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00ef6a7454..0027d7c5df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,5 +25,5 @@ jobs: run: | yarn package-headless node ./bin/package_headless.js - - name: Package core and publish - run: node ./bin/publish.js --dry + - name: Publish to npm + run: NPM_AUTH_TOKEN="${{ secrets.NPM_TOKEN }}" node ./bin/publish.js --dry From df1e7ed081416548a340bde1e1a16dcb24c45e5f Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:29:17 -0700 Subject: [PATCH 08/61] Use env var --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0027d7c5df..04ad0b9f20 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,4 +26,6 @@ jobs: yarn package-headless node ./bin/package_headless.js - name: Publish to npm - run: NPM_AUTH_TOKEN="${{ secrets.NPM_TOKEN }}" node ./bin/publish.js --dry + env: + NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + run: node ./bin/publish.js --dry From 8d7f42d85f7f5969a976fd1fda564f7336615def Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:31:48 -0700 Subject: [PATCH 09/61] Improve publish dry run --- bin/publish.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/bin/publish.js b/bin/publish.js index e65048dbdd..ec089e7bf1 100644 --- a/bin/publish.js +++ b/bin/publish.js @@ -67,25 +67,24 @@ function checkAndPublishPackage(packageDir) { const packageJsonFile = path.join(packageDir, 'package.json'); packageJson.version = nextVersion; console.log(`Set version of ${packageJsonFile} to ${nextVersion}`); - if (!isDryRun) { - fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2)); - } + fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, null, 2)); // Publish const args = ['publish']; if (!isStableRelease) { args.push('--tag', 'beta'); } + if (isDryRun) { + args.push('--dry-run'); + } console.log(`Spawn: npm ${args.join(' ')}`); - if (!isDryRun) { - const result = cp.spawnSync('npm', args, { - cwd: packageDir, - stdio: 'inherit' - }); - if (result.status) { - console.error(`Spawn exited with code ${result.status}`); - process.exit(result.status); - } + const result = cp.spawnSync('npm', args, { + cwd: packageDir, + stdio: 'inherit' + }); + if (result.status) { + console.error(`Spawn exited with code ${result.status}`); + process.exit(result.status); } console.groupEnd(); From fecdc383ec1a4efb693156f08635d3d5934de0ff Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:40:16 -0700 Subject: [PATCH 10/61] Disable publish on az pipelines --- azure-pipelines.yml | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f96a0e8a78..45a790b83b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -147,36 +147,36 @@ jobs: - script: yarn test-api-firefox --headless --forbid-only displayName: 'Integration tests (Firefox)' -- job: Release - dependsOn: - - Linux - - macOS - - Windows - - Linux_IntegrationTests - # - macOS_IntegrationTests - - Windows_IntegrationTests - condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['FORCE_RELEASE'], 'true'))) - pool: - vmImage: 'ubuntu-20.04' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - task: YarnInstaller@3 - inputs: - versionSpec: '1.x' - displayName: 'Install Yarn' - - task: CacheBeta@1 - inputs: - key: yarn2 | $(Agent.OS) | yarn.lock - path: node_modules - displayName: Cache node modules - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: | - yarn package-headless - node ./bin/package_headless.js - displayName: 'Package xterm-headless' - - script: NPM_AUTH_TOKEN="$(NPM_AUTH_TOKEN)" node ./bin/publish.js - displayName: 'Package and publish to npm' +# - job: Release +# dependsOn: +# - Linux +# - macOS +# - Windows +# - Linux_IntegrationTests +# # - macOS_IntegrationTests +# - Windows_IntegrationTests +# condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['FORCE_RELEASE'], 'true'))) +# pool: +# vmImage: 'ubuntu-20.04' +# steps: +# - task: NodeTool@0 +# inputs: +# versionSpec: '18.x' +# displayName: 'Install Node.js' +# - task: YarnInstaller@3 +# inputs: +# versionSpec: '1.x' +# displayName: 'Install Yarn' +# - task: CacheBeta@1 +# inputs: +# key: yarn2 | $(Agent.OS) | yarn.lock +# path: node_modules +# displayName: Cache node modules +# - script: yarn --frozen-lockfile +# displayName: 'Install dependencies and build' +# - script: | +# yarn package-headless +# node ./bin/package_headless.js +# displayName: 'Package xterm-headless' +# - script: NPM_AUTH_TOKEN="$(NPM_AUTH_TOKEN)" node ./bin/publish.js +# displayName: 'Package and publish to npm' From 35801a0bf4e3f377f6fad77c8433447f7efe1b22 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:42:49 -0700 Subject: [PATCH 11/61] Disable dry run, remove release on pr --- .github/workflows/release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04ad0b9f20..0f30890611 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,9 +5,6 @@ on: # If a commit reaches master, assume it has passed CI via PR and publish # without running tests to save time to publish branches: [ "master" ] - # TODO: Remove before merge - pull_request: - branches: [ "master" ] jobs: release: @@ -28,4 +25,4 @@ jobs: - name: Publish to npm env: NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - run: node ./bin/publish.js --dry + run: node ./bin/publish.js From 18d08819e863303b93b228be88c220254802ec48 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:55:43 -0700 Subject: [PATCH 12/61] Install playwright on all platforms --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43a092bcf3..ca47dd5c5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,8 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile + - name: Install playwright + run: npx playwright install - name: Integration tests (Chromium) run: yarn test-api-chromium --headless --forbid-only @@ -62,5 +64,7 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile + - name: Install playwright + run: npx playwright install - name: Integration tests (Chromium) run: yarn test-api-firefox --headless --forbid-only From 1c919e3f9d1d810b4f95f39e1e4e3aedf611d947 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:07:03 -0700 Subject: [PATCH 13/61] Experiment with build artifacts --- .github/workflows/ci.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca47dd5c5b..c14c64ec38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,37 @@ on: branches: [ "master" ] jobs: + build2: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies and build + run: yarn --frozen-lockfile + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: build-artifacts + path: ${{ github.workspace }} + + use-build2: + strategy: + matrix: + node-version: [16.x, 18.x] + runs-on: [ubuntu-latest] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: build-artifacts + - name: Display structure of downloaded files + run: ls -R + build: strategy: matrix: From 216bd9de8aee529c023cba0f7fbc328de1f53a1a Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:09:02 -0700 Subject: [PATCH 14/61] Add dependency to build2 --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c14c64ec38..9a0004f3cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: path: ${{ github.workspace }} use-build2: + needs: build2 strategy: matrix: node-version: [16.x, 18.x] @@ -37,6 +38,8 @@ jobs: name: build-artifacts - name: Display structure of downloaded files run: ls -R + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 build: strategy: From 2f97b5bd189b86a085f91a7d0ea7e3a7b772ae64 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:13:53 -0700 Subject: [PATCH 15/61] Tweak artifacts --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a0004f3cf..d604269ba6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,13 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile + - name: Tar files + run: tar -cvf build-artifacts.tar ${{ github.workspace }} - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: build-artifacts - path: ${{ github.workspace }} + path: build-artifacts.tar use-build2: needs: build2 @@ -32,10 +34,11 @@ jobs: runs-on: [ubuntu-latest] runs-on: ${{ matrix.runs-on }} steps: - - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: name: build-artifacts + - name: Extract archive + run: tar -xvf build-artifacts.tar - name: Display structure of downloaded files run: ls -R - name: Use Node.js ${{ matrix.node-version }} From e8a2795e8d2d0bb9b31b59a489a15c127486294a Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:21:11 -0700 Subject: [PATCH 16/61] Temporarily disable tests --- .github/workflows/ci.yml | 138 +++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 58 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d604269ba6..a81ac101dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node-version }} + node-version: 18.x cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile @@ -26,13 +26,9 @@ jobs: name: build-artifacts path: build-artifacts.tar - use-build2: + lint: needs: build2 - strategy: - matrix: - node-version: [16.x, 18.x] - runs-on: [ubuntu-latest] - runs-on: ${{ matrix.runs-on }} + runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 with: @@ -41,67 +37,93 @@ jobs: run: tar -xvf build-artifacts.tar - name: Display structure of downloaded files run: ls -R - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - - build: - strategy: - matrix: - node-version: [16.x, 18.x] - runs-on: [macos-latest, ubuntu-latest, windows-latest] - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: - node-version: ${{ matrix.node-version }} - cache: 'yarn' - - name: Install dependencies and build - run: yarn --frozen-lockfile - - name: Unit tests - run: yarn test-unit --forbid-only + node-version: 18.x - name: Lint code run: yarn lint - name: Lint API run: yarn lint-api - integration-tests-chromium: + unit-tests: + needs: build2 strategy: matrix: - node-version: [18.x] - runs-on: [macos-latest, ubuntu-latest, windows-latest] + node-version: [16.x, 18.x] + runs-on: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.runs-on }} steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + - uses: actions/download-artifact@v3 with: - node-version: ${{ matrix.node-version }} - cache: 'yarn' - - name: Install dependencies and build - run: yarn --frozen-lockfile - - name: Install playwright - run: npx playwright install - - name: Integration tests (Chromium) - run: yarn test-api-chromium --headless --forbid-only - - integration-tests-firefox: - strategy: - matrix: - node-version: [18.x] - runs-on: [macos-latest, ubuntu-latest, windows-latest] - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v3 + name: build-artifacts + - name: Extract archive + run: tar -xvf build-artifacts.tar + - name: Display structure of downloaded files + run: ls -R - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'yarn' - - name: Install dependencies and build - run: yarn --frozen-lockfile - - name: Install playwright - run: npx playwright install - - name: Integration tests (Chromium) - run: yarn test-api-firefox --headless --forbid-only + - name: Unit tests + run: yarn test-unit --forbid-only + + # build: + # strategy: + # matrix: + # node-version: [16.x, 18.x] + # runs-on: [macos-latest, ubuntu-latest, windows-latest] + # runs-on: ${{ matrix.runs-on }} + # steps: + # - uses: actions/checkout@v3 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node-version }} + # cache: 'yarn' + # - name: Install dependencies and build + # run: yarn --frozen-lockfile + # - name: Unit tests + # run: yarn test-unit --forbid-only + # - name: Lint code + # run: yarn lint + # - name: Lint API + # run: yarn lint-api + + # integration-tests-chromium: + # strategy: + # matrix: + # node-version: [18.x] + # runs-on: [macos-latest, ubuntu-latest, windows-latest] + # runs-on: ${{ matrix.runs-on }} + # steps: + # - uses: actions/checkout@v3 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node-version }} + # cache: 'yarn' + # - name: Install dependencies and build + # run: yarn --frozen-lockfile + # - name: Install playwright + # run: npx playwright install + # - name: Integration tests (Chromium) + # run: yarn test-api-chromium --headless --forbid-only + + # integration-tests-firefox: + # strategy: + # matrix: + # node-version: [18.x] + # runs-on: [macos-latest, ubuntu-latest, windows-latest] + # runs-on: ${{ matrix.runs-on }} + # steps: + # - uses: actions/checkout@v3 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ matrix.node-version }} + # cache: 'yarn' + # - name: Install dependencies and build + # run: yarn --frozen-lockfile + # - name: Install playwright + # run: npx playwright install + # - name: Integration tests (Chromium) + # run: yarn test-api-firefox --headless --forbid-only From 603d69b64b6d261bf514f533a5ff112c41f81db4 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:25:01 -0700 Subject: [PATCH 17/61] Try use zip --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a81ac101dd..123c004822 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,22 +19,23 @@ jobs: - name: Install dependencies and build run: yarn --frozen-lockfile - name: Tar files - run: tar -cvf build-artifacts.tar ${{ github.workspace }} + run: zip build-artifacts ${{ github.workspace }} - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: build-artifacts - path: build-artifacts.tar + path: build-artifacts.zip lint: needs: build2 runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: name: build-artifacts - name: Extract archive - run: tar -xvf build-artifacts.tar + run: zip -r build-artifacts.zip . - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x @@ -54,13 +55,12 @@ jobs: runs-on: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.runs-on }} steps: + - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 with: name: build-artifacts - name: Extract archive - run: tar -xvf build-artifacts.tar - - name: Display structure of downloaded files - run: ls -R + run: zip -r build-artifacts.zip . - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - name: Unit tests From efd854d040cbefe124b0b5c73a28af0d2c4f25a2 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:29:24 -0700 Subject: [PATCH 18/61] Zip progress --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 123c004822..7c1d235480 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,8 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile - - name: Tar files - run: zip build-artifacts ${{ github.workspace }} + - name: Zip artifacts + run: zip -r build-artifacts ${{ github.workspace }} - name: Upload artifacts uses: actions/upload-artifact@v3 with: @@ -34,8 +34,8 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts - - name: Extract archive - run: zip -r build-artifacts.zip . + - name: Unzip artifacts + run: unzip -l build-artifacts.zip . - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x From 8aa019aac2144dc9b3cb4bf9d1788e55fd9884e2 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:35:40 -0700 Subject: [PATCH 19/61] Tweak unzip --- .github/workflows/ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c1d235480..dacd2c0922 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,12 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts - - name: Unzip artifacts - run: unzip -l build-artifacts.zip . + - name: Unzip artifacts (Linux, macOS) + if: runner.os != 'Windows' + run: unzip -l build-artifacts.zip ${{ github.workspace }} + - name: Unzip artifacts (Windows) + if: runner.os == 'Windows' + run: 7z x build-artifacts.zip -o${{ github.workspace }} - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x @@ -59,8 +63,12 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts - - name: Extract archive - run: zip -r build-artifacts.zip . + - name: Unzip artifacts (Linux, macOS) + if: runner.os != 'Windows' + run: unzip -l build-artifacts.zip ${{ github.workspace }} + - name: Unzip artifacts (Windows) + if: runner.os == 'Windows' + run: 7z x build-artifacts.zip -o${{ github.workspace }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - name: Unit tests From 27ba753d374fd484bb66c70c6a699ffd24be0731 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:42:05 -0700 Subject: [PATCH 20/61] Change zip contents --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dacd2c0922..4453f16ad4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: - name: Install dependencies and build run: yarn --frozen-lockfile - name: Zip artifacts - run: zip -r build-artifacts ${{ github.workspace }} + run: | + cd ${{ github.workspace }} + zip -r build-artifacts ${{ github.workspace }} - name: Upload artifacts uses: actions/upload-artifact@v3 with: From 2bbda34fd6bc0e68c1950bd905a1bdc745cd3cb1 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:04:42 -0700 Subject: [PATCH 21/61] Tweak zip --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4453f16ad4..8cb84233b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,10 @@ jobs: - name: Install dependencies and build run: yarn --frozen-lockfile - name: Zip artifacts + shell: pwsh run: | - cd ${{ github.workspace }} - zip -r build-artifacts ${{ github.workspace }} + Compress-Archive + zip -r build-artifacts ${{ github.workspace }}/* - name: Upload artifacts uses: actions/upload-artifact@v3 with: From 4b460605965201f01951c8611ebb0d68c55c205c Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:06:52 -0700 Subject: [PATCH 22/61] Fix zip --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cb84233b6..866b12e8c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,7 @@ jobs: - name: Install dependencies and build run: yarn --frozen-lockfile - name: Zip artifacts - shell: pwsh - run: | - Compress-Archive - zip -r build-artifacts ${{ github.workspace }}/* + run: zip -r build-artifacts ${{ github.workspace }}/* - name: Upload artifacts uses: actions/upload-artifact@v3 with: From 21b77b85e8acd436f67c278b5993d01c459faab0 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:09:29 -0700 Subject: [PATCH 23/61] cd into dir --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 866b12e8c4..523a806e06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: - name: Install dependencies and build run: yarn --frozen-lockfile - name: Zip artifacts - run: zip -r build-artifacts ${{ github.workspace }}/* + run: | + cd ${{ github.workspace }} + zip -r build-artifacts ./* - name: Upload artifacts uses: actions/upload-artifact@v3 with: From f1e6b7d719d82bddc2f952f1c9055dc2853379cf Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:21:28 -0700 Subject: [PATCH 24/61] Explicitly list out dirs to archive --- .github/workflows/ci.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 523a806e06..3762938a32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,29 @@ jobs: - name: Zip artifacts run: | cd ${{ github.workspace }} - zip -r build-artifacts ./* + zip -r build-artifacts \ + ./out/* \ + ./out-test/* \ + ./addons/xterm-addon-attach/out/* \ + ./addons/xterm-addon-attach/out-test/* + ./addons/xterm-addon-canvas/out/* \ + ./addons/xterm-addon-canvas/out-test/* + ./addons/xterm-addon-fit/out/* \ + ./addons/xterm-addon-fit/out-test/* + ./addons/xterm-addon-image/out/* \ + ./addons/xterm-addon-image/out-test/* + ./addons/xterm-addon-ligatures/out/* \ + ./addons/xterm-addon-ligatures/out-test/* + ./addons/xterm-addon-search/out/* \ + ./addons/xterm-addon-search/out-test/* + ./addons/xterm-addon-serialize/out/* \ + ./addons/xterm-addon-serialize/out-test/* + ./addons/xterm-addon-unicode11/out/* \ + ./addons/xterm-addon-unicode11/out-test/* + ./addons/xterm-addon-web-links/out/* \ + ./addons/xterm-addon-web-links/out-test/* + ./addons/xterm-addon-webgl/out/* \ + ./addons/xterm-addon-webgl/out-test/* - name: Upload artifacts uses: actions/upload-artifact@v3 with: From 431951361611a718c5cc33b193a51b5beb9b0bb6 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:29:13 -0700 Subject: [PATCH 25/61] Fix file permissions --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3762938a32..957fba2bbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,7 @@ jobs: - name: Zip artifacts run: | cd ${{ github.workspace }} + chmod -R 0777 ${{ github.workspace }} zip -r build-artifacts \ ./out/* \ ./out-test/* \ From 02563d2ad54f1e1bbc27576d8d61ad92512a0c26 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:32:08 -0700 Subject: [PATCH 26/61] Add missing line wraps --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 957fba2bbb..c6bb93ef45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,23 +26,23 @@ jobs: ./out/* \ ./out-test/* \ ./addons/xterm-addon-attach/out/* \ - ./addons/xterm-addon-attach/out-test/* + ./addons/xterm-addon-attach/out-test/* \ ./addons/xterm-addon-canvas/out/* \ - ./addons/xterm-addon-canvas/out-test/* + ./addons/xterm-addon-canvas/out-test/* \ ./addons/xterm-addon-fit/out/* \ - ./addons/xterm-addon-fit/out-test/* + ./addons/xterm-addon-fit/out-test/* \ ./addons/xterm-addon-image/out/* \ - ./addons/xterm-addon-image/out-test/* + ./addons/xterm-addon-image/out-test/* \ ./addons/xterm-addon-ligatures/out/* \ - ./addons/xterm-addon-ligatures/out-test/* + ./addons/xterm-addon-ligatures/out-test/* \ ./addons/xterm-addon-search/out/* \ - ./addons/xterm-addon-search/out-test/* + ./addons/xterm-addon-search/out-test/* \ ./addons/xterm-addon-serialize/out/* \ - ./addons/xterm-addon-serialize/out-test/* + ./addons/xterm-addon-serialize/out-test/* \ ./addons/xterm-addon-unicode11/out/* \ - ./addons/xterm-addon-unicode11/out-test/* + ./addons/xterm-addon-unicode11/out-test/* \ ./addons/xterm-addon-web-links/out/* \ - ./addons/xterm-addon-web-links/out-test/* + ./addons/xterm-addon-web-links/out-test/* \ ./addons/xterm-addon-webgl/out/* \ ./addons/xterm-addon-webgl/out-test/* - name: Upload artifacts From 8741ea035e4a6ba51dc1221dcc0c2d15082e5956 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:38:11 -0700 Subject: [PATCH 27/61] Renames --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6bb93ef45..867be54944 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: build-artifacts - path: build-artifacts.zip + path: build.zip lint: needs: build2 @@ -61,10 +61,10 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip -l build-artifacts.zip ${{ github.workspace }} + run: unzip -l build.zip ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x build-artifacts.zip -o${{ github.workspace }} + run: 7z x build.zip -o${{ github.workspace }} - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x From d01311e274f24bcc3baf5de99db3d15c61d030fe Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:41:11 -0700 Subject: [PATCH 28/61] Fix file name --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 867be54944..3a428dcb5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,7 @@ jobs: - name: Zip artifacts run: | cd ${{ github.workspace }} - chmod -R 0777 ${{ github.workspace }} - zip -r build-artifacts \ + zip -r build \ ./out/* \ ./out-test/* \ ./addons/xterm-addon-attach/out/* \ @@ -50,6 +49,7 @@ jobs: with: name: build-artifacts path: build.zip + if-no-files-found: error lint: needs: build2 From 87ae3097e7f6ce2c18b97b9c5fa12899f2776fc5 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:43:09 -0700 Subject: [PATCH 29/61] Try without zipping --- .github/workflows/ci.yml | 56 +++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a428dcb5d..03b829edc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,37 +18,33 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile - - name: Zip artifacts - run: | - cd ${{ github.workspace }} - zip -r build \ - ./out/* \ - ./out-test/* \ - ./addons/xterm-addon-attach/out/* \ - ./addons/xterm-addon-attach/out-test/* \ - ./addons/xterm-addon-canvas/out/* \ - ./addons/xterm-addon-canvas/out-test/* \ - ./addons/xterm-addon-fit/out/* \ - ./addons/xterm-addon-fit/out-test/* \ - ./addons/xterm-addon-image/out/* \ - ./addons/xterm-addon-image/out-test/* \ - ./addons/xterm-addon-ligatures/out/* \ - ./addons/xterm-addon-ligatures/out-test/* \ - ./addons/xterm-addon-search/out/* \ - ./addons/xterm-addon-search/out-test/* \ - ./addons/xterm-addon-serialize/out/* \ - ./addons/xterm-addon-serialize/out-test/* \ - ./addons/xterm-addon-unicode11/out/* \ - ./addons/xterm-addon-unicode11/out-test/* \ - ./addons/xterm-addon-web-links/out/* \ - ./addons/xterm-addon-web-links/out-test/* \ - ./addons/xterm-addon-webgl/out/* \ - ./addons/xterm-addon-webgl/out-test/* - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: build-artifacts - path: build.zip + path: | + out/ + out-test/ + addons/xterm-addon-attach/out/ + addons/xterm-addon-attach/out-test/ + addons/xterm-addon-canvas/out/ + addons/xterm-addon-canvas/out-test/ + addons/xterm-addon-fit/out/ + addons/xterm-addon-fit/out-test/ + addons/xterm-addon-image/out/ + addons/xterm-addon-image/out-test/ + addons/xterm-addon-ligatures/out/ + addons/xterm-addon-ligatures/out-test/ + addons/xterm-addon-search/out/ + addons/xterm-addon-search/out-test/ + addons/xterm-addon-serialize/out/ + addons/xterm-addon-serialize/out-test/ + addons/xterm-addon-unicode11/out/ + addons/xterm-addon-unicode11/out-test/ + addons/xterm-addon-web-links/out/ + addons/xterm-addon-web-links/out-test/ + addons/xterm-addon-webgl/out/ + addons/xterm-addon-webgl/out-test/ if-no-files-found: error lint: @@ -59,12 +55,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts - - name: Unzip artifacts (Linux, macOS) - if: runner.os != 'Windows' - run: unzip -l build.zip ${{ github.workspace }} - - name: Unzip artifacts (Windows) - if: runner.os == 'Windows' - run: 7z x build.zip -o${{ github.workspace }} - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x From 4220e0c6168d5d69a9f50b19b7ffd462bf56edba Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:46:34 -0700 Subject: [PATCH 30/61] Revert "Try without zipping" This reverts commit 87ae3097e7f6ce2c18b97b9c5fa12899f2776fc5. --- .github/workflows/ci.yml | 56 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03b829edc5..3a428dcb5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,33 +18,37 @@ jobs: cache: 'yarn' - name: Install dependencies and build run: yarn --frozen-lockfile + - name: Zip artifacts + run: | + cd ${{ github.workspace }} + zip -r build \ + ./out/* \ + ./out-test/* \ + ./addons/xterm-addon-attach/out/* \ + ./addons/xterm-addon-attach/out-test/* \ + ./addons/xterm-addon-canvas/out/* \ + ./addons/xterm-addon-canvas/out-test/* \ + ./addons/xterm-addon-fit/out/* \ + ./addons/xterm-addon-fit/out-test/* \ + ./addons/xterm-addon-image/out/* \ + ./addons/xterm-addon-image/out-test/* \ + ./addons/xterm-addon-ligatures/out/* \ + ./addons/xterm-addon-ligatures/out-test/* \ + ./addons/xterm-addon-search/out/* \ + ./addons/xterm-addon-search/out-test/* \ + ./addons/xterm-addon-serialize/out/* \ + ./addons/xterm-addon-serialize/out-test/* \ + ./addons/xterm-addon-unicode11/out/* \ + ./addons/xterm-addon-unicode11/out-test/* \ + ./addons/xterm-addon-web-links/out/* \ + ./addons/xterm-addon-web-links/out-test/* \ + ./addons/xterm-addon-webgl/out/* \ + ./addons/xterm-addon-webgl/out-test/* - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: build-artifacts - path: | - out/ - out-test/ - addons/xterm-addon-attach/out/ - addons/xterm-addon-attach/out-test/ - addons/xterm-addon-canvas/out/ - addons/xterm-addon-canvas/out-test/ - addons/xterm-addon-fit/out/ - addons/xterm-addon-fit/out-test/ - addons/xterm-addon-image/out/ - addons/xterm-addon-image/out-test/ - addons/xterm-addon-ligatures/out/ - addons/xterm-addon-ligatures/out-test/ - addons/xterm-addon-search/out/ - addons/xterm-addon-search/out-test/ - addons/xterm-addon-serialize/out/ - addons/xterm-addon-serialize/out-test/ - addons/xterm-addon-unicode11/out/ - addons/xterm-addon-unicode11/out-test/ - addons/xterm-addon-web-links/out/ - addons/xterm-addon-web-links/out-test/ - addons/xterm-addon-webgl/out/ - addons/xterm-addon-webgl/out-test/ + path: build.zip if-no-files-found: error lint: @@ -55,6 +59,12 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts + - name: Unzip artifacts (Linux, macOS) + if: runner.os != 'Windows' + run: unzip -l build.zip ${{ github.workspace }} + - name: Unzip artifacts (Windows) + if: runner.os == 'Windows' + run: 7z x build.zip -o${{ github.workspace }} - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x From 862249c48c5f548b377a28e0b6d05c859e6e6ada Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:48:42 -0700 Subject: [PATCH 31/61] Try double unzip --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a428dcb5d..c1cf8b56a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: build-artifacts - path: build.zip + path: compressed-build.zip if-no-files-found: error lint: @@ -61,10 +61,14 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip -l build.zip ${{ github.workspace }} + run: | + unzip build-artifacts.zip + unzip -l compressed-build.zip ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x build.zip -o${{ github.workspace }} + run: | + 7z x build-artifacts.zip + 7z x compressed-build.zip -o${{ github.workspace }} - name: Display structure of downloaded files run: ls -R - name: Use Node.js 18.x From c19ccd6e5f0e4b72de5ab6b3a26385cebfeab41b Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:51:06 -0700 Subject: [PATCH 32/61] Fix zip name, install without scripts --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1cf8b56a2..d2e115e580 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Zip artifacts run: | cd ${{ github.workspace }} - zip -r build \ + zip -r compressed-build \ ./out/* \ ./out-test/* \ ./addons/xterm-addon-attach/out/* \ @@ -75,6 +75,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x + - name: Install dependencies + run: yarn --frozen-lockfile --ignore-scripts - name: Lint code run: yarn lint - name: Lint API From 760e36f12d29c212fef8583116d097c909572147 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:53:22 -0700 Subject: [PATCH 33/61] Include inwasm build --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2e115e580..5f53679385 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: ./addons/xterm-addon-canvas/out-test/* \ ./addons/xterm-addon-fit/out/* \ ./addons/xterm-addon-fit/out-test/* \ + ./addons/xterm-addon-image/inwasm-builds/out/* \ ./addons/xterm-addon-image/out/* \ ./addons/xterm-addon-image/out-test/* \ ./addons/xterm-addon-ligatures/out/* \ From 1ceb33ca2a5c61c0d371db5b1c5619f44af40911 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:55:01 -0700 Subject: [PATCH 34/61] Qualify paths --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f53679385..f3f4025a06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,8 +63,8 @@ jobs: - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' run: | - unzip build-artifacts.zip - unzip -l compressed-build.zip ${{ github.workspace }} + unzip ${{ github.workspace }}/build-artifacts.zip + unzip ${{ github.workspace }}/compressed-build.zip ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: | From be1eab0503428aea0ecc84acf9347ef401c6f858 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:59:01 -0700 Subject: [PATCH 35/61] ls after download --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3f4025a06..02ad5de2c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,8 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts + - name: Display structure of downloaded files + run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' run: | @@ -70,8 +72,6 @@ jobs: run: | 7z x build-artifacts.zip 7z x compressed-build.zip -o${{ github.workspace }} - - name: Display structure of downloaded files - run: ls -R - name: Use Node.js 18.x uses: actions/setup-node@v3 with: From 8aff48bad198177ab128815b83c81afafa1355b6 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:01:41 -0700 Subject: [PATCH 36/61] Don't double unzip --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02ad5de2c2..40184f0b0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,14 +64,10 @@ jobs: run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: | - unzip ${{ github.workspace }}/build-artifacts.zip - unzip ${{ github.workspace }}/compressed-build.zip ${{ github.workspace }} + run: unzip compressed-build.zip ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: | - 7z x build-artifacts.zip - 7z x compressed-build.zip -o${{ github.workspace }} + run: 7z x compressed-build.zip -o${{ github.workspace }} - name: Use Node.js 18.x uses: actions/setup-node@v3 with: From 6c9fbbb5d21c225f34c5c7f4832e10baeddb35d8 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:04:41 -0700 Subject: [PATCH 37/61] Use -d flag --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40184f0b0b..54a526dd4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,10 +64,10 @@ jobs: run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip compressed-build.zip ${{ github.workspace }} + run: unzip compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x compressed-build.zip -o${{ github.workspace }} + run: 7z x compressed-build.zip -o ${{ github.workspace }} - name: Use Node.js 18.x uses: actions/setup-node@v3 with: @@ -91,12 +91,14 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts + - name: Display structure of downloaded files + run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip -l build-artifacts.zip ${{ github.workspace }} + run: unzip compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x build-artifacts.zip -o${{ github.workspace }} + run: 7z x compressed-build.zip -o ${{ github.workspace }} - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - name: Unit tests From 302870d44f98b00ef9f928b1c09e2811cd919df7 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:10:19 -0700 Subject: [PATCH 38/61] Verbose unzip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54a526dd4b..15321d2380 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip compressed-build.zip -d ${{ github.workspace }} + run: unzip -v compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o ${{ github.workspace }} From 46dead3f53ce2ee341c8919f92562ac1591aca95 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:14:19 -0700 Subject: [PATCH 39/61] Skip download on lint, download on unit tests --- .github/workflows/ci.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15321d2380..3e6beef7a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [ "master" ] jobs: - build2: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -53,21 +53,9 @@ jobs: if-no-files-found: error lint: - needs: build2 runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: build-artifacts - - name: Display structure of downloaded files - run: ls -R - - name: Unzip artifacts (Linux, macOS) - if: runner.os != 'Windows' - run: unzip -v compressed-build.zip -d ${{ github.workspace }} - - name: Unzip artifacts (Windows) - if: runner.os == 'Windows' - run: 7z x compressed-build.zip -o ${{ github.workspace }} - name: Use Node.js 18.x uses: actions/setup-node@v3 with: @@ -80,7 +68,7 @@ jobs: run: yarn lint-api unit-tests: - needs: build2 + needs: build strategy: matrix: node-version: [16.x, 18.x] @@ -95,12 +83,16 @@ jobs: run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip compressed-build.zip -d ${{ github.workspace }} + run: unzip -v compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o ${{ github.workspace }} - - name: Use Node.js ${{ matrix.node-version }} + - name: Use Node.js 18.x uses: actions/setup-node@v3 + with: + node-version: 18.x + - name: Install dependencies + run: yarn --frozen-lockfile --ignore-scripts - name: Unit tests run: yarn test-unit --forbid-only From b476d01173962f2dbb7297485385ce192fc0ffc7 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:15:40 -0700 Subject: [PATCH 40/61] Use yarn cache --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e6beef7a4..eacc7b2576 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x + cache: 'yarn' - name: Install dependencies run: yarn --frozen-lockfile --ignore-scripts - name: Lint code @@ -91,6 +92,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x + cache: 'yarn' - name: Install dependencies run: yarn --frozen-lockfile --ignore-scripts - name: Unit tests From 31be6d1c53b2b80c75ab0b20b8586477c6ec720d Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:16:56 -0700 Subject: [PATCH 41/61] Remove whitespace --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eacc7b2576..0eb8602546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: run: unzip -v compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x compressed-build.zip -o ${{ github.workspace }} + run: 7z x compressed-build.zip -o${{ github.workspace }} - name: Use Node.js 18.x uses: actions/setup-node@v3 with: From 8b7bcd505cee39671f8edde2f49894b4578595e7 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:18:09 -0700 Subject: [PATCH 42/61] Split install deps and build --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0eb8602546..9a9caa1e9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,10 @@ jobs: with: node-version: 18.x cache: 'yarn' - - name: Install dependencies and build - run: yarn --frozen-lockfile + - name: Install dependencies + run: yarn --frozen-lockfile --ignore-scripts + - name: Build + run: yarn setup - name: Zip artifacts run: | cd ${{ github.workspace }} From 63ff9b53255b9e545e60bc12fd7bbff3e38e68cd Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:20:30 -0700 Subject: [PATCH 43/61] Print structure after unzip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a9caa1e9a..bfb0dde2d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,14 +82,14 @@ jobs: - uses: actions/download-artifact@v3 with: name: build-artifacts - - name: Display structure of downloaded files - run: ls -R - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' run: unzip -v compressed-build.zip -d ${{ github.workspace }} - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} + - name: Print directory structure + run: ls -R - name: Use Node.js 18.x uses: actions/setup-node@v3 with: From 7fa022529a9a19bd3aeed37077c5121c83818750 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:23:33 -0700 Subject: [PATCH 44/61] Don't set dir --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfb0dde2d5..0ebcd8467d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip -v compressed-build.zip -d ${{ github.workspace }} + run: unzip -v compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} From fdd29a452465c444eda80444d969956b1a684218 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:26:52 -0700 Subject: [PATCH 45/61] Change dir --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ebcd8467d..f4989b3785 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,10 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip -v compressed-build.zip + run: | + pwd + cd ${{ github.workspace }} + unzip -v compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} From e2b75548d089ae189a224eba4c9d54f68a11b320 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:31:17 -0700 Subject: [PATCH 46/61] Not verbose --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4989b3785..456e498f40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: run: | pwd cd ${{ github.workspace }} - unzip -v compressed-build.zip + unzip compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} From ff8e4acd389a78a28c20764757764b6a6efda521 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:36:25 -0700 Subject: [PATCH 47/61] Don't include inwasm --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 456e498f40..3e4cc582b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: run: yarn setup - name: Zip artifacts run: | - cd ${{ github.workspace }} zip -r compressed-build \ ./out/* \ ./out-test/* \ @@ -32,7 +31,6 @@ jobs: ./addons/xterm-addon-canvas/out-test/* \ ./addons/xterm-addon-fit/out/* \ ./addons/xterm-addon-fit/out-test/* \ - ./addons/xterm-addon-image/inwasm-builds/out/* \ ./addons/xterm-addon-image/out/* \ ./addons/xterm-addon-image/out-test/* \ ./addons/xterm-addon-ligatures/out/* \ @@ -84,10 +82,7 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: | - pwd - cd ${{ github.workspace }} - unzip compressed-build.zip + run: unzip compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} From 2556751705ef037cc1f686e91a4edf2875c5df29 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:47:15 -0700 Subject: [PATCH 48/61] Remove yarn prepare --ignore-scripts ends up preventing node-pty from building, to optimize we need to split these up more --- .github/workflows/ci.yml | 6 +++--- package.json | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e4cc582b7..53f0d36ada 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: node-version: 18.x cache: 'yarn' - name: Install dependencies - run: yarn --frozen-lockfile --ignore-scripts + run: yarn --frozen-lockfile - name: Build run: yarn setup - name: Zip artifacts @@ -62,7 +62,7 @@ jobs: node-version: 18.x cache: 'yarn' - name: Install dependencies - run: yarn --frozen-lockfile --ignore-scripts + run: yarn --frozen-lockfile - name: Lint code run: yarn lint - name: Lint API @@ -94,7 +94,7 @@ jobs: node-version: 18.x cache: 'yarn' - name: Install dependencies - run: yarn --frozen-lockfile --ignore-scripts + run: yarn --frozen-lockfile - name: Unit tests run: yarn test-unit --forbid-only diff --git a/package.json b/package.json index 5fc4e55801..dbd38dc68e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "test-unit-coverage": "node ./bin/test.js --coverage", "test-unit-dev": "cross-env NODE_PATH='./out' mocha", "build": "tsc -b ./tsconfig.all.json", - "prepare": "npm run setup", "setup": "npm run build", "presetup": "node ./bin/install-addons.js", "postsetup": "npm run inwasm", From 34a4dbc157ee21e9623bf562c6a7d21252b9e99b Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:50:14 -0700 Subject: [PATCH 49/61] Include inwasm in archive --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53f0d36ada..432a6834e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ jobs: ./addons/xterm-addon-canvas/out-test/* \ ./addons/xterm-addon-fit/out/* \ ./addons/xterm-addon-fit/out-test/* \ + ./addons/xterm-addon-image/inwasm-builds/out/* \ ./addons/xterm-addon-image/out/* \ ./addons/xterm-addon-image/out-test/* \ ./addons/xterm-addon-ligatures/out/* \ From 382e4f27257b08bf219fd2b8ea85a6815a611c25 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:53:00 -0700 Subject: [PATCH 50/61] Overwrite when unzipping --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 432a6834e4..6f49744ff5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: name: build-artifacts - name: Unzip artifacts (Linux, macOS) if: runner.os != 'Windows' - run: unzip compressed-build.zip + run: unzip -o compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' run: 7z x compressed-build.zip -o${{ github.workspace }} From ace0243a93abfb53aa56c90546493c81d7f4ccee Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:56:33 -0700 Subject: [PATCH 51/61] Overwrite unzip files on Windows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f49744ff5..97cc3d63aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: run: unzip -o compressed-build.zip - name: Unzip artifacts (Windows) if: runner.os == 'Windows' - run: 7z x compressed-build.zip -o${{ github.workspace }} + run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} - name: Print directory structure run: ls -R - name: Use Node.js 18.x From 394409b5a5e94e91503f9494943d25da48035aff Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:01:45 -0700 Subject: [PATCH 52/61] Build inwasm in tests --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97cc3d63aa..b47e569ff4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: - name: Install dependencies run: yarn --frozen-lockfile - name: Build - run: yarn setup + run: | + yarn setup + yarn inwasm - name: Zip artifacts run: | zip -r compressed-build \ @@ -89,13 +91,15 @@ jobs: run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} - name: Print directory structure run: ls -R - - name: Use Node.js 18.x + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: ${{ matrix.node-version }} cache: 'yarn' - name: Install dependencies run: yarn --frozen-lockfile + - name: Build inwasm + run: yarn inwasm - name: Unit tests run: yarn test-unit --forbid-only From eecbfba412e21545f4b06c991e2f1df0eda51bed Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:04:36 -0700 Subject: [PATCH 53/61] Change to install addon deps --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b47e569ff4..b09daee23c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,8 +98,8 @@ jobs: cache: 'yarn' - name: Install dependencies run: yarn --frozen-lockfile - - name: Build inwasm - run: yarn inwasm + - name: Install addon dependencies + run: node ./bin/install-addons.js - name: Unit tests run: yarn test-unit --forbid-only From f7e78f7f2c7d35271480688cca33216815b25f26 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:05:30 -0700 Subject: [PATCH 54/61] Move addon install to yarn --- .github/workflows/ci.yml | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b09daee23c..22e85ec0fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,8 +98,6 @@ jobs: cache: 'yarn' - name: Install dependencies run: yarn --frozen-lockfile - - name: Install addon dependencies - run: node ./bin/install-addons.js - name: Unit tests run: yarn test-unit --forbid-only diff --git a/package.json b/package.json index dbd38dc68e..4fb383fda9 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "test-unit-dev": "cross-env NODE_PATH='./out' mocha", "build": "tsc -b ./tsconfig.all.json", "setup": "npm run build", - "presetup": "node ./bin/install-addons.js", + "postinstall": "node ./bin/install-addons.js", "postsetup": "npm run inwasm", "prepublishOnly": "npm run package", "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput", From 52e7963fdb37216cc3ae149094b597af8c7be2ba Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:08:55 -0700 Subject: [PATCH 55/61] Add build step to release workflow --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f30890611..1e26e438f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,10 @@ jobs: with: node-version: 18.x cache: 'yarn' - - name: Install dependencies and build + - name: Install dependencies run: yarn --frozen-lockfile + - name: Build + run: yarn setup - name: Package headless run: | yarn package-headless From a2d2711b220698adc2862d1796cf43ae682c5d15 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:12:24 -0700 Subject: [PATCH 56/61] Add integration test jobs back --- .github/workflows/ci.yml | 100 ++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22e85ec0fa..3d6c448f5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,64 +101,44 @@ jobs: - name: Unit tests run: yarn test-unit --forbid-only - # build: - # strategy: - # matrix: - # node-version: [16.x, 18.x] - # runs-on: [macos-latest, ubuntu-latest, windows-latest] - # runs-on: ${{ matrix.runs-on }} - # steps: - # - uses: actions/checkout@v3 - # - name: Use Node.js ${{ matrix.node-version }} - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node-version }} - # cache: 'yarn' - # - name: Install dependencies and build - # run: yarn --frozen-lockfile - # - name: Unit tests - # run: yarn test-unit --forbid-only - # - name: Lint code - # run: yarn lint - # - name: Lint API - # run: yarn lint-api - - # integration-tests-chromium: - # strategy: - # matrix: - # node-version: [18.x] - # runs-on: [macos-latest, ubuntu-latest, windows-latest] - # runs-on: ${{ matrix.runs-on }} - # steps: - # - uses: actions/checkout@v3 - # - name: Use Node.js ${{ matrix.node-version }} - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node-version }} - # cache: 'yarn' - # - name: Install dependencies and build - # run: yarn --frozen-lockfile - # - name: Install playwright - # run: npx playwright install - # - name: Integration tests (Chromium) - # run: yarn test-api-chromium --headless --forbid-only + integration-tests-chromium: + needs: build + strategy: + matrix: + node-version: [18.x] + runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies + run: yarn --frozen-lockfile + - name: Install playwright + run: npx playwright install + - name: Integration tests (Chromium) + run: yarn test-api-chromium --headless --forbid-only - # integration-tests-firefox: - # strategy: - # matrix: - # node-version: [18.x] - # runs-on: [macos-latest, ubuntu-latest, windows-latest] - # runs-on: ${{ matrix.runs-on }} - # steps: - # - uses: actions/checkout@v3 - # - name: Use Node.js ${{ matrix.node-version }} - # uses: actions/setup-node@v3 - # with: - # node-version: ${{ matrix.node-version }} - # cache: 'yarn' - # - name: Install dependencies and build - # run: yarn --frozen-lockfile - # - name: Install playwright - # run: npx playwright install - # - name: Integration tests (Chromium) - # run: yarn test-api-firefox --headless --forbid-only + integration-tests-firefox: + needs: build + strategy: + matrix: + node-version: [18.x] + runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'yarn' + - name: Install dependencies + run: yarn --frozen-lockfile + - name: Install playwright + run: npx playwright install + - name: Integration tests (Chromium) + run: yarn test-api-firefox --headless --forbid-only From d469e325560e0f553e70cc17ae774384d6d08859 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:25:28 -0700 Subject: [PATCH 57/61] Download in integration tests --- .github/workflows/ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d6c448f5b..7643a2cc9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,6 +110,17 @@ jobs: runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: build-artifacts + - name: Unzip artifacts (Linux, macOS) + if: runner.os != 'Windows' + run: unzip -o compressed-build.zip + - name: Unzip artifacts (Windows) + if: runner.os == 'Windows' + run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} + - name: Print directory structure + run: ls -R - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: @@ -131,6 +142,17 @@ jobs: runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: build-artifacts + - name: Unzip artifacts (Linux, macOS) + if: runner.os != 'Windows' + run: unzip -o compressed-build.zip + - name: Unzip artifacts (Windows) + if: runner.os == 'Windows' + run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} + - name: Print directory structure + run: ls -R - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: From 7b28ecc83d7cc4452eba7e9cbda5b16a11e4435f Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:57:40 -0700 Subject: [PATCH 58/61] Disable macOS integration tests --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7643a2cc9d..fc92b01f1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,7 +106,7 @@ jobs: strategy: matrix: node-version: [18.x] - runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 @@ -138,7 +138,7 @@ jobs: strategy: matrix: node-version: [18.x] - runs-on: [macos-latest, ubuntu-latest, windows-latest] + runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 From 593c5534a56d046e4c9654b8c2eb57fc8c18b6e0 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 13:58:36 -0700 Subject: [PATCH 59/61] Use browser strategy --- .github/workflows/ci.yml | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc92b01f1e..a3fa40de99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,12 +101,13 @@ jobs: - name: Unit tests run: yarn test-unit --forbid-only - integration-tests-chromium: + integration-tests: needs: build strategy: matrix: node-version: [18.x] runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky + browser: [chromium, firefox] runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 @@ -130,37 +131,5 @@ jobs: run: yarn --frozen-lockfile - name: Install playwright run: npx playwright install - - name: Integration tests (Chromium) - run: yarn test-api-chromium --headless --forbid-only - - integration-tests-firefox: - needs: build - strategy: - matrix: - node-version: [18.x] - runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: build-artifacts - - name: Unzip artifacts (Linux, macOS) - if: runner.os != 'Windows' - run: unzip -o compressed-build.zip - - name: Unzip artifacts (Windows) - if: runner.os == 'Windows' - run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} - - name: Print directory structure - run: ls -R - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'yarn' - - name: Install dependencies - run: yarn --frozen-lockfile - - name: Install playwright - run: npx playwright install - - name: Integration tests (Chromium) - run: yarn test-api-firefox --headless --forbid-only + - name: Integration tests (${{ matrix.browser }}) + run: yarn test-api-${{ matrix.browser }} --headless --forbid-only From 792d7cdfde4c116967ba0947207dc82f13753b4e Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 14:21:04 -0700 Subject: [PATCH 60/61] Remove azure pipeline --- azure-pipelines.yml | 182 -------------------------------------------- 1 file changed, 182 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 45a790b83b..0000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,182 +0,0 @@ -pr: - branches: - include: ["main"] - -trigger: - branches: - include: ["main"] - -jobs: -- job: Linux - pool: - vmImage: 'ubuntu-20.04' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - task: YarnInstaller@3 - inputs: - versionSpec: '1.x' - displayName: 'Install Yarn' - - task: CacheBeta@1 - inputs: - key: yarn2 | $(Agent.OS) | yarn.lock - path: node_modules - displayName: Cache node modules - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: | - yarn test-unit-coverage --forbid-only - EXIT_CODE=$? - ./node_modules/.bin/nyc report --reporter=cobertura - exit $EXIT_CODE - displayName: 'Unit tests' - - script: yarn lint - displayName: 'Lint code' - - script: yarn lint-api - displayName: 'Lint API' - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/*coverage.xml' - displayName: 'Publish coverage' - -- job: macOS - pool: - vmImage: 'macOS-11' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - task: CacheBeta@1 - inputs: - key: yarn2 | $(Agent.OS) | yarn.lock - path: node_modules - displayName: Cache node modules - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: yarn test-unit --forbid-only - displayName: 'Unit tests' - - script: yarn lint - displayName: 'Lint code' - - script: yarn lint-api - displayName: 'Lint API' - -- job: Windows - pool: - vmImage: 'windows-2019' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - task: CacheBeta@1 - inputs: - key: yarn2 | $(Agent.OS) | yarn.lock - path: node_modules - displayName: Cache node modules - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: yarn test-unit --forbid-only - displayName: 'Unit tests' - - script: yarn lint - displayName: 'Lint code' - - script: yarn lint-api - displayName: 'Lint API' - -- job: Linux_IntegrationTests - pool: - vmImage: 'ubuntu-20.04' - steps: - - script: | - # source: https://github.com/microsoft/playwright/issues/1041 - sudo apt update - sudo apt install libwoff1 libopus0 libwebp6 libwebpdemux2 libenchant1c2a libgudev-1.0-0 libsecret-1-0 libhyphen0 libgdk-pixbuf2.0-0 libegl1 libnotify4 libxslt1.1 libevent-2.1-6 libgles2 libgl1 libegl1 libvpx5 - # for chromium - sudo apt install libnss3 libxss1 libasound2 - # for firefox - sudo apt install libdbus-glib-1-2 libxt6 - displayName: Install required packages - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - task: YarnInstaller@3 - inputs: - versionSpec: '1.x' - displayName: 'Install Yarn' - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: yarn test-api-chromium --headless --forbid-only - displayName: 'Integration tests (Chromium)' - - script: xvfb-run --auto-servernum -- bash -c "yarn test-api-firefox --headless --forbid-only" - displayName: 'Integration tests (Firefox)' - -# Integration tests are too flaky on macOS https://github.com/xtermjs/xterm.js/issues/3590 -# - job: macOS_IntegrationTests -# pool: -# vmImage: 'macOS-11' -# steps: -# - task: NodeTool@0 -# inputs: -# versionSpec: '18.x' -# displayName: 'Install Node.js' -# - script: yarn --frozen-lockfile -# displayName: 'Install dependencies and build' -# - script: yarn test-api-chromium --headless --forbid-only -# displayName: 'Integration tests (Chromium)' -# - script: yarn test-api-firefox --headless --forbid-only -# displayName: 'Integration tests (Firefox)' -# - script: yarn test-api-webkit --headless --forbid-only -# displayName: 'Integration tests (Webkit)' - -- job: Windows_IntegrationTests - pool: - vmImage: 'windows-2019' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' - - script: yarn --frozen-lockfile - displayName: 'Install dependencies and build' - - script: yarn test-api-chromium --headless --forbid-only - displayName: 'Integration tests (Chromium)' - - script: yarn test-api-firefox --headless --forbid-only - displayName: 'Integration tests (Firefox)' - -# - job: Release -# dependsOn: -# - Linux -# - macOS -# - Windows -# - Linux_IntegrationTests -# # - macOS_IntegrationTests -# - Windows_IntegrationTests -# condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['FORCE_RELEASE'], 'true'))) -# pool: -# vmImage: 'ubuntu-20.04' -# steps: -# - task: NodeTool@0 -# inputs: -# versionSpec: '18.x' -# displayName: 'Install Node.js' -# - task: YarnInstaller@3 -# inputs: -# versionSpec: '1.x' -# displayName: 'Install Yarn' -# - task: CacheBeta@1 -# inputs: -# key: yarn2 | $(Agent.OS) | yarn.lock -# path: node_modules -# displayName: Cache node modules -# - script: yarn --frozen-lockfile -# displayName: 'Install dependencies and build' -# - script: | -# yarn package-headless -# node ./bin/package_headless.js -# displayName: 'Package xterm-headless' -# - script: NPM_AUTH_TOKEN="$(NPM_AUTH_TOKEN)" node ./bin/publish.js -# displayName: 'Package and publish to npm' From dbe1ad2c52794b8319075e4b2eb9bfc44b40d3a0 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 19 Aug 2023 14:23:04 -0700 Subject: [PATCH 61/61] Simplify build step --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3fa40de99..491f6a7956 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,7 @@ jobs: - name: Install dependencies run: yarn --frozen-lockfile - name: Build - run: | - yarn setup - yarn inwasm + run: yarn setup - name: Zip artifacts run: | zip -r compressed-build \