package/ci: rename build matrix IDs -- there's not just GL anymore.

package/ci/appveyor.yml

@@ -7,47 +7,47 @@ environment:
   - TARGET: desktop
     COMPILER: msvc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-desktop-msvc2015
+    APPVEYOR_JOB_NAME: windows-gl-msvc2015
   - TARGET: desktop
     COMPILER: msvc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-desktop-msvc2017
+    APPVEYOR_JOB_NAME: windows-gl-msvc2017
   - TARGET: desktop
     COMPILER: mingw
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-desktop-mingw
+    APPVEYOR_JOB_NAME: windows-gl-mingw
   - TARGET: desktop-gles
     TARGET_GLES2: ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-es2-msvc2015
+    APPVEYOR_JOB_NAME: windows-gles2-msvc2015
   - TARGET: desktop-gles
     TARGET_GLES2: ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-es2-msvc2017
+    APPVEYOR_JOB_NAME: windows-gles2-msvc2017
   - TARGET: desktop-gles
     TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-es3-msvc2015
+    APPVEYOR_JOB_NAME: windows-gles3-msvc2015
   - TARGET: desktop-gles
     TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-es3-msvc2017
+    APPVEYOR_JOB_NAME: windows-gles3-msvc2017
   - TARGET: rt
     TARGET_GLES2: ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-rt-es2-msvc2015
+    APPVEYOR_JOB_NAME: windows-rt-gles2-msvc2015
   - TARGET: rt
     TARGET_GLES2: ON
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-rt-es2-msvc2017
+    APPVEYOR_JOB_NAME: windows-rt-gles2-msvc2017
   - TARGET: rt
     TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    APPVEYOR_JOB_NAME: windows-rt-es3-msvc2015
+    APPVEYOR_JOB_NAME: windows-rt-gles3-msvc2015
   - TARGET: rt
     TARGET_GLES2: OFF
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    APPVEYOR_JOB_NAME: windows-rt-es3-msvc2017
+    APPVEYOR_JOB_NAME: windows-rt-gles3-msvc2017
 
 notifications:
 - provider: Webhook

package/ci/travis.yml

@@ -24,7 +24,7 @@ matrix:
     dist: trusty
     compiler: gcc
     env:
-    - JOBID=linux-desktop
+    - JOBID=linux-gl
     - TARGET=desktop
     - CMAKE_CXX_FLAGS="--coverage"
     - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.7"
@@ -33,7 +33,7 @@ matrix:
     dist: trusty
     compiler: gcc
     env:
-    - JOBID=linux-desktop-nondeprecated
+    - JOBID=linux-nondeprecated
     - TARGET=desktop
     - BUILD_DEPRECATED=OFF
   - language: cpp
@@ -41,7 +41,7 @@ matrix:
     dist: trusty
     compiler: clang
     env:
-    - JOBID=linux-desktop-sanitizers
+    - JOBID=linux-sanitizers
     - TARGET=desktop-sanitizers
     - CMAKE_CXX_FLAGS=-fsanitize=address
     addons:
@@ -77,7 +77,7 @@ matrix:
     dist: trusty
     compiler: gcc
     env:
-    - JOBID=linux-es2
+    - JOBID=linux-gles2
     - TARGET=desktop-gles
     - TARGET_GLES2=ON
     - CMAKE_CXX_FLAGS="--coverage"
@@ -87,7 +87,7 @@ matrix:
     dist: trusty
     compiler: gcc
     env:
-    - JOBID=linux-es3
+    - JOBID=linux-gles3
     - TARGET=desktop-gles
     - TARGET_GLES2=OFF
     - CMAKE_CXX_FLAGS="--coverage"
@@ -104,21 +104,21 @@ matrix:
     osx_image: xcode9.3beta
     compiler: clang
     env:
-    - JOBID=macos-desktop
+    - JOBID=macos-gl
     - TARGET=desktop
     - CMAKE_CXX_FLAGS="--coverage"
   - language: cpp
     os: osx
     osx_image: xcode7.3
     env:
-    - JOBID=ios-es2
+    - JOBID=ios-gles2
     - TARGET=ios-simulator
     - TARGET_GLES2=ON
   - language: cpp
     os: osx
     osx_image: xcode7.3
     env:
-    - JOBID=ios-es3
+    - JOBID=ios-gles3
     - TARGET=ios-simulator
     - TARGET_GLES2=OFF
   - language: cpp
@@ -139,7 +139,7 @@ matrix:
     os: linux
     dist: trusty
     env:
-    - JOBID=android-es2
+    - JOBID=android-gles2
     - TARGET=android
     - TARGET_GLES2=ON
     addons:
@@ -155,7 +155,7 @@ matrix:
     os: linux
     dist: trusty
     env:
-    - JOBID=android-es3
+    - JOBID=android-gles3
     - TARGET=android
     - TARGET_GLES2=OFF
     addons: