From 9f0e5641ab50b846341cf30a2039b3dbdff8108a Mon Sep 17 00:00:00 2001
From: pathmapper <20856381+pathmapper@users.noreply.github.com>
Date: Sun, 31 May 2020 21:54:53 +0200
Subject: [PATCH 1/5] Integrate desktop builds in ci workflow

---
 .github/workflows/ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfcc52f..fe7aa2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,9 @@ jobs:
   build-artifacts:
     name: "build/artifacts (${{ matrix.os }})"
     runs-on: ${{ matrix.os }}
+    env:
+      GOPATH: ${{ github.workspace }}
+      GO111MODULE: off
 
     if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
 
@@ -102,6 +105,52 @@ jobs:
         name: editor-profiling
         path: build/profiling
 
+    # Build, test and upload desktop CLI artifacts
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.14.x
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+      with:
+        repository: maputnik/desktop
+        path: ./src/github.com/maputnik/desktop/
+
+    - name: Get style
+      run:  wget https://maputnik.github.io/osm-liberty/style.json
+
+    - name: Make
+      run: cd src/github.com/maputnik/desktop/ && make
+
+    - name: Test --help
+      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --help
+
+    - name: Test --version
+      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --version
+
+    - name: Test --watch
+      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --watch --file style.json & sleep 5; kill $!
+
+    - name: Artifacts/linux
+      uses: actions/upload-artifact@v1
+      with:
+        name: maputnik-linux
+        path: ./src/github.com/maputnik/desktop/bin/linux/
+
+    - name: Artifacts/darwin
+      uses: actions/upload-artifact@v1
+      with:
+        name: maputnik-darwin
+        path: ./src/github.com/maputnik/desktop/bin/darwin/
+
+    - name: Artifacts/windows
+      uses: actions/upload-artifact@v1
+      with:
+        name: maputnik-windows
+        path: ./src/github.com/maputnik/desktop/bin/windows/
+
   # build and test the editor in standalone-chrome
   test_selenium_standalone_chrome:
     name: "test/standalone-chrome (${{ matrix.os }})"

From da297fe82ca12cbb457866def1af0719f2358d70 Mon Sep 17 00:00:00 2001
From: pathmapper <20856381+pathmapper@users.noreply.github.com>
Date: Wed, 3 Jun 2020 10:12:32 +0200
Subject: [PATCH 2/5] Checkout a particular SHA

https://github.com/maputnik/editor/pull/698#issuecomment-636748873
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe7aa2d..60141a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,6 +116,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: maputnik/desktop
+        ref: fda11e5
         path: ./src/github.com/maputnik/desktop/
 
     - name: Get style

From e21f412933e88992608a6a66dc72a4e5e441798e Mon Sep 17 00:00:00 2001
From: pathmapper <20856381+pathmapper@users.noreply.github.com>
Date: Wed, 3 Jun 2020 10:26:44 +0200
Subject: [PATCH 3/5] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60141a7..b646847 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,7 +116,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: maputnik/desktop
-        ref: fda11e5
+        ref: fda11e52e7da1df3d758514ae7aba58d9acb6e0f
         path: ./src/github.com/maputnik/desktop/
 
     - name: Get style

From af92aac7ec3ceecd9ddaa688b6526f9055aa9727 Mon Sep 17 00:00:00 2001
From: pathmapper <20856381+pathmapper@users.noreply.github.com>
Date: Wed, 3 Jun 2020 13:45:59 +0200
Subject: [PATCH 4/5] Remove tests

---
 .github/workflows/ci.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b646847..0f9182c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,21 +119,9 @@ jobs:
         ref: fda11e52e7da1df3d758514ae7aba58d9acb6e0f
         path: ./src/github.com/maputnik/desktop/
 
-    - name: Get style
-      run:  wget https://maputnik.github.io/osm-liberty/style.json
-
     - name: Make
       run: cd src/github.com/maputnik/desktop/ && make
 
-    - name: Test --help
-      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --help
-
-    - name: Test --version
-      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --version
-
-    - name: Test --watch
-      run: ./src/github.com/maputnik/desktop/bin/linux/maputnik --watch --file style.json & sleep 5; kill $!
-
     - name: Artifacts/linux
       uses: actions/upload-artifact@v1
       with:

From 04b3b425243bc110c916089a577d6f6d1b6558df Mon Sep 17 00:00:00 2001
From: pathmapper <20856381+pathmapper@users.noreply.github.com>
Date: Wed, 3 Jun 2020 15:37:17 +0200
Subject: [PATCH 5/5] Use desktop version instead of SHA

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f9182c..5b9650e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,7 +105,7 @@ jobs:
         name: editor-profiling
         path: build/profiling
 
-    # Build, test and upload desktop CLI artifacts
+    # Build and upload desktop CLI artifacts
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
@@ -116,7 +116,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: maputnik/desktop
-        ref: fda11e52e7da1df3d758514ae7aba58d9acb6e0f
+        ref: v1.0.6
         path: ./src/github.com/maputnik/desktop/
 
     - name: Make