[qt, build] Rename Qt builds to follow convention

CI job naming convention is: <platform>-<optional-descriptor>-<buildtype>

1 files changed, 66 insertions, 66 deletions

diff --git a/circle.yml b/circle.yml
index a79c769256..acf60f3acc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,8 +32,6 @@ workflows:
       - linux-clang4-sanitize-thread
       - linux-gcc4.9-debug
       - linux-gcc5-debug-coverage
-      - linux-gcc5-release-qt4
-      - linux-gcc5-release-qt5
       - ios-debug
       - ios-sanitize
       - ios-sanitize-address
@@ -46,7 +44,9 @@ workflows:
             branches:
               ignore: /.*/
       - macos-debug
-      - macos-debug-qt5
+      - qt4-linux-gcc5-release
+      - qt5-linux-gcc5-release
+      - qt5-macos-debug
 
 step-library:
   - &generate-cache-key
@@ -164,9 +164,9 @@ step-library:
           brew install node@6
           brew link node@6 --force --overwrite
 
-  - &install-macos-qt-dependencies
+  - &install-qt-macos-dependencies
       run:
-        name: Install macOS Qt dependencies
+        name: Install Qt macOS dependencies
         command: |
           brew install qt
           brew link qt --force
@@ -660,65 +660,6 @@ jobs:
             platform/linux/scripts/coveralls.sh
 
 # ------------------------------------------------------------------------------
-  linux-gcc5-release-qt4:
-    docker:
-      - image: mbgl/7d2403f42e:linux-gcc-5-qt-4
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Release
-      GTEST_OUTPUT: xml
-      LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libjemalloc.so
-    steps:
-      - checkout
-      - *generate-cache-key
-      - *restore-cache
-      - *reset-ccache-stats
-      - *build-qt-app
-      - *build-qt-test
-      - *show-ccache-stats
-      - *save-cache
-      - run:
-          name: Run memory-load tests
-          command: |
-            xvfb-run --server-args="-screen 0 1024x768x24" \
-              make run-qt-test-Memory.*:*.Load
-            scripts/log_memory_benchmarks.sh test_detail.xml "Platform=Linux,Compiler=${_CC},Arch=$(uname -m)"
-
-# ------------------------------------------------------------------------------
-  linux-gcc5-release-qt5:
-    docker:
-      - image: mbgl/7d2403f42e:linux-gcc-5-qt-5.9
-    resource_class: large
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Release
-      WITH_QT_I18N: 1
-    steps:
-      - checkout
-      - *generate-cache-key
-      - *restore-cache
-      - *reset-ccache-stats
-      - *build-qt-app
-      - *build-qt-test
-      - run:
-          name: Build qt-docs
-          command: make qt-docs
-      - *show-ccache-stats
-      - *save-cache
-      - run:
-          name: Run valgrind-backed tests
-          environment:
-            JOBS: 1 # https://github.com/mapbox/mapbox-gl-native/issues/9108
-          command: |
-            xvfb-run --server-args="-screen 0 1024x768x24" \
-              build/qt-linux-x86_64/Release/mbgl-test --gtest_filter=-*.Load --gtest_filter=-Memory.Vector
-
-# ------------------------------------------------------------------------------
   ios-debug:
     macos:
       xcode: "9.4.0"
@@ -886,7 +827,66 @@ jobs:
       - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
-  macos-debug-qt5:
+  qt4-linux-gcc5-release:
+    docker:
+      - image: mbgl/7d2403f42e:linux-gcc-5-qt-4
+    resource_class: large
+    working_directory: /src
+    environment:
+      LIBSYSCONFCPUS: 4
+      JOBS: 4
+      BUILDTYPE: Release
+      GTEST_OUTPUT: xml
+      LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libjemalloc.so
+    steps:
+      - checkout
+      - *generate-cache-key
+      - *restore-cache
+      - *reset-ccache-stats
+      - *build-qt-app
+      - *build-qt-test
+      - *show-ccache-stats
+      - *save-cache
+      - run:
+          name: Run memory-load tests
+          command: |
+            xvfb-run --server-args="-screen 0 1024x768x24" \
+              make run-qt-test-Memory.*:*.Load
+            scripts/log_memory_benchmarks.sh test_detail.xml "Platform=Linux,Compiler=${_CC},Arch=$(uname -m)"
+
+# ------------------------------------------------------------------------------
+  qt5-linux-gcc5-release:
+    docker:
+      - image: mbgl/7d2403f42e:linux-gcc-5-qt-5.9
+    resource_class: large
+    working_directory: /src
+    environment:
+      LIBSYSCONFCPUS: 4
+      JOBS: 4
+      BUILDTYPE: Release
+      WITH_QT_I18N: 1
+    steps:
+      - checkout
+      - *generate-cache-key
+      - *restore-cache
+      - *reset-ccache-stats
+      - *build-qt-app
+      - *build-qt-test
+      - run:
+          name: Build qt-docs
+          command: make qt-docs
+      - *show-ccache-stats
+      - *save-cache
+      - run:
+          name: Run valgrind-backed tests
+          environment:
+            JOBS: 1 # https://github.com/mapbox/mapbox-gl-native/issues/9108
+          command: |
+            xvfb-run --server-args="-screen 0 1024x768x24" \
+              build/qt-linux-x86_64/Release/mbgl-test --gtest_filter=-*.Load --gtest_filter=-Memory.Vector
+
+# ------------------------------------------------------------------------------
+  qt5-macos-debug:
     macos:
       xcode: "9.3.0"
     environment:
@@ -895,7 +895,7 @@ jobs:
     steps:
       - checkout
       - *install-macos-dependencies
-      - *install-macos-qt-dependencies
+      - *install-qt-macos-dependencies
       - *generate-cache-key
       - *restore-cache
       - *reset-ccache-stats