From 21303bd06a0c7ee6d57e12866037cf00b888271a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Thu, 8 Nov 2018 18:49:45 +0900
Subject: [PATCH] Update CircleCI configuration (#3163)

* Update config.yml

* Update config.yml
---
 .circleci/config.yml | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0119b68df..9b398ad11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,5 @@
 version: 2.1
 
-general:
-  branches:
-    ignore:
-      - l10n_develop
-      - imgbot
-
 executors:
   default:
     working_directory: /tmp/workspace
@@ -17,8 +11,20 @@ executors:
     working_directory: /tmp/workspace
     docker:
       - image: docker:latest
+  alpine:
+    working_directory: /tmp/workspace
+    docker:
+      - image: alpine:latest
 
 jobs:
+  ok:
+    executor: alpine
+    steps:
+      - run:
+          name: OK
+          command: |
+            echo -e '\033[0;32mOK\033[0;39m'
+
   build:
     executor: default
     steps:
@@ -111,6 +117,9 @@ jobs:
                 command: |
                   if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
                    then
+                    curl -LSs 'https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64' > jq
+                    chmod +x jq
+                    docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
                     docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
                     docker push misskey/misskey
                    else
@@ -121,10 +130,27 @@ workflows:
   version: 2
   build-and-test:
     jobs:
-      - build
+      - ok:
+          filters:
+            branches:
+              only:
+                - l10n_develop
+                - imgbot
+      - build:
+          filters:
+            branches:
+              ignore:
+                - l10n_develop
+                - imgbot
       - test:
           requires:
             - build
+          filters:
+            branches:
+              ignore:
+#                - master
+                - l10n_develop
+                - imgbot
       - test:
           without_redis: "true"
           requires: