From 5956df58f89c8a3f9da7aedcd8ae8f9b88c03850 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Wed, 12 Feb 2020 13:52:06 -0800
Subject: [PATCH] devops: re-factor github workflow internal structure (#956)

---
 .github/workflows/chromium-linux.yml   |  37 --------
 .github/workflows/chromium-mac.yml     |  32 -------
 .github/workflows/chromium-windows.yml |  32 -------
 .github/workflows/docs-and-lint.yml    |  37 --------
 .github/workflows/firefox-linux.yml    |  35 -------
 .github/workflows/firefox-mac.yml      |  32 -------
 .github/workflows/firefox-windows.yml  |  32 -------
 .github/workflows/infra.yml            |  29 ++++++
 .github/workflows/tests.yml            | 125 +++++++++++++++++++++++++
 .github/workflows/webkit-linux.yml     |  40 --------
 .github/workflows/webkit-mac.yml       |  32 -------
 .github/workflows/webkit-windows.yml   |  32 -------
 12 files changed, 154 insertions(+), 341 deletions(-)
 delete mode 100644 .github/workflows/chromium-linux.yml
 delete mode 100644 .github/workflows/chromium-mac.yml
 delete mode 100644 .github/workflows/chromium-windows.yml
 delete mode 100644 .github/workflows/docs-and-lint.yml
 delete mode 100644 .github/workflows/firefox-linux.yml
 delete mode 100644 .github/workflows/firefox-mac.yml
 delete mode 100644 .github/workflows/firefox-windows.yml
 create mode 100644 .github/workflows/infra.yml
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .github/workflows/webkit-linux.yml
 delete mode 100644 .github/workflows/webkit-mac.yml
 delete mode 100644 .github/workflows/webkit-windows.yml

diff --git a/.github/workflows/chromium-linux.yml b/.github/workflows/chromium-linux.yml
deleted file mode 100644
index 2384d374ef..0000000000
--- a/.github/workflows/chromium-linux.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: "tests: Linux + CR"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install required packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install libgbm-dev
-        sudo apt-get install xvfb
-
-    - name: npm install, build, and test
-      run: |
-        npm install
-        xvfb-run --auto-servernum npm run ctest
-      env:
-        CI: true
diff --git a/.github/workflows/chromium-mac.yml b/.github/workflows/chromium-mac.yml
deleted file mode 100644
index 438929e9fa..0000000000
--- a/.github/workflows/chromium-mac.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Mac + CR"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: macos
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run ctest
-      env:
-        CI: true
diff --git a/.github/workflows/chromium-windows.yml b/.github/workflows/chromium-windows.yml
deleted file mode 100644
index 6d00f86ab9..0000000000
--- a/.github/workflows/chromium-windows.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Win + CR"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run ctest
-      env:
-        CI: true
diff --git a/.github/workflows/docs-and-lint.yml b/.github/workflows/docs-and-lint.yml
deleted file mode 100644
index 798979215d..0000000000
--- a/.github/workflows/docs-and-lint.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: "docs & lint"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install required packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install libgbm-dev
-        sudo apt-get install xvfb
-
-    - name: npm install, build, and test
-      run: |
-        npm install
-        npm run lint
-      env:
-        CI: true
diff --git a/.github/workflows/firefox-linux.yml b/.github/workflows/firefox-linux.yml
deleted file mode 100644
index 860556535b..0000000000
--- a/.github/workflows/firefox-linux.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: "tests: Linux + FF"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install required packages
-      run: |
-        sudo apt-get install xvfb
-
-    - name: npm install, build, and test
-      run: |
-        npm install
-        xvfb-run --auto-servernum npm run ftest
-      env:
-        CI: true
diff --git a/.github/workflows/firefox-mac.yml b/.github/workflows/firefox-mac.yml
deleted file mode 100644
index 9d70c398be..0000000000
--- a/.github/workflows/firefox-mac.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Mac + FF"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: macos
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run ftest
-      env:
-        CI: true
diff --git a/.github/workflows/firefox-windows.yml b/.github/workflows/firefox-windows.yml
deleted file mode 100644
index 3f727e170d..0000000000
--- a/.github/workflows/firefox-windows.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Win + FF"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run ftest
-      env:
-        CI: true
diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml
new file mode 100644
index 0000000000..854c542636
--- /dev/null
+++ b/.github/workflows/infra.yml
@@ -0,0 +1,29 @@
+name: "infra"
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  CI: true
+
+jobs:
+  doc-and-lint:
+    name: "docs & lint"
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - name: install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install libgbm-dev
+        sudo apt-get install xvfb
+    - run: npm install
+    - run: npm run lint
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..5b54d5343f
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,125 @@
+name: tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  CI: true
+
+jobs:
+  tests_linux_chromium:
+    name: "Linux + CR"
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - name: install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install libgbm-dev xvfb
+    - run: npm install
+    - run: xvfb-run --auto-servernum npm run ctest
+
+  tests_linux_firefox:
+    name: "Linux + FF"
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - name: install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install xvfb
+    - run: npm install
+    - run: xvfb-run --auto-servernum npm run ftest
+
+  tests_linux_webkit:
+    name: "Linux + WK"
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - name: install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install libwoff1 libopus0 libwebp6 libwebpdemux2 libenchant1c2a libgudev-1.0-0 libsecret-1-0 libhyphen0 libgdk-pixbuf2.0-0 libegl1 libgles2 libevent-2.1-6 libnotify4 libxslt1.1
+        sudo apt-get install xvfb
+    - run: npm install
+    - run: xvfb-run --auto-servernum npm run wtest
+
+  tests_win_chromium:
+    name: "Win + CR"
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run ctest
+
+  tests_win_firefox:
+    name: "Win + FF"
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run ftest
+
+  tests_win_webkit:
+    name: "Win + WK"
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run wtest
+
+  tests_mac_chromium:
+    name: "Mac + CR"
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run ctest
+
+  tests_mac_firefox:
+    name: "Mac + FF"
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run ftest
+
+  tests_mac_webkit:
+    name: "Mac + WK"
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.15
+    - run: npm install
+    - run: npm run wtest
diff --git a/.github/workflows/webkit-linux.yml b/.github/workflows/webkit-linux.yml
deleted file mode 100644
index c7d2862504..0000000000
--- a/.github/workflows/webkit-linux.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: "tests: Linux + WK"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: install required packages
-      run: |
-        sudo apt update
-        sudo apt-get install libwoff1 libopus0 libwebp6 libwebpdemux2 libenchant1c2a libgudev-1.0-0 libsecret-1-0 libhyphen0 libgdk-pixbuf2.0-0 libegl1 libgles2 libevent-2.1-6 libnotify4 libxslt1.1
-        sudo apt-get install xvfb
-
-    - name: npm install, build, and test
-      run: |
-        npm install
-        # The following logs LDD status of all webkit-wpe shared objects and executables.
-        # pushd .local-webkit/$(ls .local-webkit)/minibrowser-wpe; ls -1 | grep -v pw_run.sh | LD_LIBRARY_PATH=$PWD xargs ldd; popd
-
-        xvfb-run --auto-servernum npm run wtest
-      env:
-        CI: true
diff --git a/.github/workflows/webkit-mac.yml b/.github/workflows/webkit-mac.yml
deleted file mode 100644
index f05f4f308f..0000000000
--- a/.github/workflows/webkit-mac.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Mac + WK"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: macos
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run wtest
-      env:
-        CI: true
diff --git a/.github/workflows/webkit-windows.yml b/.github/workflows/webkit-windows.yml
deleted file mode 100644
index 3eba639cc9..0000000000
--- a/.github/workflows/webkit-windows.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "tests: Win + WK"
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches: 
-      - master
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: npm install, and test
-      run: |
-        npm install
-        npm run wtest
-      env:
-        CI: true