From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Tue, 17 Nov 2020 03:02:34 +0000 (+0200)
Subject: Remove set-env from actions (#8063)
X-Git-Tag: v3.0.0-beta.7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7610def1c4709467b2a9136e62a8e54d1a529aef;p=thirdparty%2FChart.js.git

Remove set-env from actions (#8063)

* Remove set-env from CI

* Eanble macOs

* Another try on macOs, update npmpublish

* No xvfb-run on macOs

* Remove macos
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55f5f4490..27b4ad022 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,27 +23,18 @@ jobs:
     - uses: actions/checkout@v2
     - name: Use Node.js
       uses: actions/setup-node@v1
-    - name: Setup xvfb
-      run: |
-        Xvfb :99 -screen 0 1024x768x24 &
-        echo "::set-env name=DISPLAY:::99.0"
-      if: runner.os == 'Linux'
-    - name: Install chrome
-      run: |
-        brew update
-        brew cask install google-chrome
-      if: runner.os == 'macOS'
-    - name: Select browsers
-      run: |
-        if [ "${{ runner.os }}" == "macOS" ]; then
-          echo "::set-env name=BROWSERS::--browsers chrome"
-        fi
-      shell: bash
     - name: Build and Test
       run: |
         npm ci
         npm run build
-        npm test
+        if [ "${{ runner.os }}" == "Windows" ]; then
+          npm test
+        elif [ "${{ runner.os }}" == "macOS" ]; then
+          npm test --browsers chrome,safari
+        else
+          xvfb-run --auto-servernum npm test
+        fi
+      shell: bash
     - name: Package
       run: |
         npm run docs
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
index bbe9d8490..40506f7a9 100644
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.trim.outputs.version }}
-    steps: 
+    steps:
       - id: trim
         run: echo "::set-output name=version::${TAG:1}"
-        env: 
+        env:
           TAG: ${{ github.event.release.tag_name }}
 
   test:
@@ -24,14 +24,10 @@ jobs:
     - uses: actions/checkout@v2
     - name: Use Node.js
       uses: actions/setup-node@v1
-    - name: Setup xvfb
-      run: |
-        Xvfb :99 -screen 0 1024x768x24 &
-        echo "::set-env name=DISPLAY:::99.0"
     - name: Test
       run: |
         npm ci
-        npm test
+        xvfb-run --auto-servernum npm test
 
   publish-npm:
     needs: [test, setup]