Merge pull request #7489 from EOSIO/zach-pipeline-config

Fix Incorrectly Resolved and Untested Merge Conflicts in Pipeline Configuration File
EOSIO · Jun 11, 2019 · 70b30af · 70b30af
2 parents 1e4407d + 94422ba
commit 70b30af
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/pipeline.jsonc b/pipeline.jsonc
@@ -1,15 +1,19 @@
 {
-    "eosio": {
-        "environment": {
-            "IMAGE_TAG": "1.9.0-develop",
-            "HELPER_ENABLED": true
+    "eosio":
+    {
+        "environment":
+        {
+            "HELPER_ENABLED": true,
+            "IMAGE_TAG": "1.9.0-develop"
         }
     },
-    "eosio-build-unpinned": {
-        "pipeline-branch": "protocol-features-sync-nodes"
-    },
-    "eosio-lrt": {
-        "pipeline-branch": "protocol-features-sync-nodes"
+    "eosio-lrt":
+    {
+        "environment":
+        {
+            "BUILD_FLAGS": "-y -P -m",
+            "IMAGE_TAG": "_1-8-0-rc2"
+        }
     },
     "eos-multiversion-tests":
     {