Merge pull request #932 from garden-io/ci-split-lint

Small CI fixes
garden-io · Jul 9, 2019 · 6b14162 · 6b14162
2 parents 7172a65 + 1236863
commit 6b14162
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -184,6 +184,18 @@ jobs:
             - dashboard/build/
             - garden-service/build/
             - garden-service/static/
+  lint:
+    <<: *node-config
+    steps:
+      - checkout
+      - npm_install
+      - *attach-workspace
+      - run:
+          name: Make sure generated docs are up-to-date
+          command: npm run check-docs
+      - run:
+          name: lint
+          command: npm run lint
   test-service:
     <<: *node-config
     steps:
@@ -197,12 +209,6 @@ jobs:
           command: |
             git config --global user.name "Garden CI"
             git config --global user.email "admin@garden.io"
-      - run:
-          name: Make sure generated docs are up-to-date
-          command: npm run check-docs
-      - run:
-          name: lint
-          command: npm run lint
       - run:
           name: test
           command: |
@@ -267,7 +273,7 @@ jobs:
           context: garden-service
           image: $DOCKER_ORG/garden-gcloud
           dockerfile: gcloud.Dockerfile
-  release-service-pkg:
+  build-service-dist:
     <<: *node-config
     steps:
       - checkout
@@ -288,7 +294,15 @@ workflows:
       - test-service:
           requires:
             - build-service
+      - lint:
+          requires:
+            - build-service
       - integ-test-service:
+          # Don't attempt to run integ tests for external PRs (they won't have access to the required keys)
+          filters:
+            branches:
+              # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
+              ignore: /pull\/[0-9]+/
           requires:
             - build-service
       - test-dashboard:
@@ -299,6 +313,10 @@ workflows:
       # Duplicated here so we can reference steps that depends on it
       - build-service:
           <<: *only-master
+      - lint:
+          <<: *only-master
+          requires:
+            - build-service
       - test-service:
           <<: *only-master
           requires:
@@ -315,7 +333,7 @@ workflows:
           context: docker
           requires:
             - release-service-docker
-      - release-service-pkg:
+      - build-service-dist:
           <<: *only-master
           requires:
             - build-service
@@ -325,6 +343,10 @@ workflows:
       # Duplicated here so we can reference steps that depends on it
       - build-service:
           <<: *only-tags
+      - lint:
+          <<: *only-tags
+          requires:
+          - build-service
       - test-service:
           <<: *only-tags
           requires:
@@ -341,7 +363,7 @@ workflows:
           context: docker
           requires:
             - release-service-docker
-      - release-service-pkg:
+      - build-service-dist:
           <<: *only-tags
           requires:
             - build-service
diff --git a/garden-service/bin/build-pkg.sh b/garden-service/bin/build-pkg.sh
@@ -30,23 +30,23 @@ echo "-> Preparing packages..."
 echo "  -> linux-amd64"
 rm -rf linux-amd64
 mkdir linux-amd64
-mv garden-cli-linux linux-amd64/garden
+mv garden-service-linux linux-amd64/garden
 cp -r ../tmp/dist/static linux-amd64
 echo "    -> tar"
 tar -czf garden-${version}-linux-amd64.tar.gz linux-amd64
 
 echo "  -> alpine-amd64"
 rm -rf alpine-amd64
 mkdir alpine-amd64
-mv garden-cli-alpine alpine-amd64/garden
+mv garden-service-alpine alpine-amd64/garden
 cp -r ../tmp/dist/static alpine-amd64
 echo "    -> tar"
 tar -czf garden-${version}-alpine-amd64.tar.gz alpine-amd64
 
 echo "  -> macos-amd64"
 rm -rf macos-amd64
 mkdir macos-amd64
-mv garden-cli-macos macos-amd64/garden
+mv garden-service-macos macos-amd64/garden
 cp -r ../tmp/dist/static macos-amd64
 # need to include the .node binary for fsevents
 cp ../lib/fsevents/node-v64-darwin-x64/fse.node macos-amd64/fse.node
@@ -57,7 +57,7 @@ echo "  -> windows-amd64"
 rm -rf windows-amd64
 mkdir windows-amd64
 # Name should match go release and other standards using full "windows" name
-mv garden-cli-win.exe windows-amd64/garden.exe
+mv garden-service-win.exe windows-amd64/garden.exe
 cp -r ../tmp/dist/static windows-amd64
 echo "    -> zip"
 zip -q -r garden-${version}-windows-amd64.zip windows-amd64
diff --git a/support/install.ps1 b/support/install.ps1
@@ -9,7 +9,7 @@
 # 5. Installs or updates the garden binary.
 #
 # To execute it run the following command in PowerShell:
-# Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/master/garden-cli/support/install.ps1'))
+# Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/garden-io/garden/master/support/install.ps1'))
 #
 # For more information visit https://docs.garden.io/