summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml40
1 files changed, 33 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0119b68df6..9b398ad111 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: