From aa21e70cc5048d2c58005d4c883b16bf8add46dc Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Tue, 31 Aug 2021 09:55:03 +0200 Subject: [PATCH] [ci] Use Github Actions for Windows x86 testing --- .github/workflows/ci.yml | 17 ++++++++++++++--- README.md | 1 - appveyor.yml | 19 ------------------- 3 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 158a50e32..84735d39a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: + arch: + - x64 + - x86 node: - 8 - 10 @@ -19,14 +22,22 @@ jobs: - macOS-latest - ubuntu-latest - windows-latest + exclude: + - arch: x86 + os: macOS-latest + - arch: x86 + os: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node }} + architecture: ${{ matrix.arch }} - run: npm install - run: npm run lint - if: matrix.node == 16 && matrix.os == 'ubuntu-latest' + if: + matrix.os == 'ubuntu-latest' && matrix.node == 16 && matrix.arch == + 'x64' - run: npm test - run: echo ::set-output name=job_id::$(node -e @@ -36,8 +47,8 @@ jobs: - uses: coverallsapp/github-action@v1.1.2 with: flag-name: - ${{ steps.get_job_id.outputs.job_id }} (Node.js ${{ matrix.node }} - on ${{ matrix.os }}) + ${{ steps.get_job_id.outputs.job_id }} (Node.js ${{ matrix.node }} - + $ {{ matrix.arch }} on ${{ matrix.os }}) github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true coverage: diff --git a/README.md b/README.md index 1cb19d650..f959c83b8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![Version npm](https://img.shields.io/npm/v/ws.svg?logo=npm)](https://www.npmjs.com/package/ws) [![Build](https://img.shields.io/github/workflow/status/websockets/ws/CI/master?label=build&logo=github)](https://github.com/websockets/ws/actions?query=workflow%3ACI+branch%3Amaster) -[![Windows x86 Build](https://img.shields.io/appveyor/ci/lpinca/ws/master.svg?logo=appveyor)](https://ci.appveyor.com/project/lpinca/ws) [![Coverage Status](https://img.shields.io/coveralls/websockets/ws/master.svg?logo=coveralls)](https://coveralls.io/github/websockets/ws) ws is a simple to use, blazing fast, and thoroughly tested WebSocket client and diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f4c05fbf4..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,19 +0,0 @@ -environment: - matrix: - - nodejs_version: '16' - - nodejs_version: '14' - - nodejs_version: '12' - - nodejs_version: '10' - - nodejs_version: '8' -platform: - - x86 -matrix: - fast_finish: true -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - npm install -test_script: - - node --version - - npm --version - - npm test -build: off