Auto abort incorrect target
This commit is contained in:
parent
b2c60fb513
commit
48862ef783
@ -2,41 +2,41 @@ version: 2.1
|
|||||||
|
|
||||||
executors:
|
executors:
|
||||||
v11-node11:
|
v11-node11:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v11-node11
|
- image: misskey/ci:v11-node11
|
||||||
- image: circleci/postgres:latest
|
- image: circleci/postgres:latest
|
||||||
- image: circleci/redis:latest
|
- image: circleci/redis:latest
|
||||||
v11-node8:
|
v11-node8:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v11-node8
|
- image: misskey/ci:v11-node8
|
||||||
- image: circleci/postgres:latest
|
- image: circleci/postgres:latest
|
||||||
- image: circleci/redis:latest
|
- image: circleci/redis:latest
|
||||||
v10-node11:
|
v10-node11:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v10-node11
|
- image: misskey/ci:v10-node11
|
||||||
- image: circleci/mongo:latest
|
- image: circleci/mongo:latest
|
||||||
v10-node11-redis:
|
v10-node11-redis:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v10-node11
|
- image: misskey/ci:v10-node11
|
||||||
- image: circleci/mongo:latest
|
- image: circleci/mongo:latest
|
||||||
v10-node8:
|
v10-node8:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v10-node8
|
- image: misskey/ci:v10-node8
|
||||||
- image: circleci/mongo:latest
|
- image: circleci/mongo:latest
|
||||||
- image: circleci/redis:latest
|
- image: circleci/redis:latest
|
||||||
v10-node8-redis:
|
v10-node8-redis:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:v10-node8
|
- image: misskey/ci:v10-node8
|
||||||
- image: circleci/mongo:latest
|
- image: circleci/mongo:latest
|
||||||
- image: circleci/redis:latest
|
- image: circleci/redis:latest
|
||||||
docker:
|
docker:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
- image: misskey/ci:docker
|
- image: misskey/ci:docker
|
||||||
|
|
||||||
@ -46,6 +46,9 @@ jobs:
|
|||||||
executor:
|
executor:
|
||||||
type: string
|
type: string
|
||||||
default: "v11-node11"
|
default: "v11-node11"
|
||||||
|
target:
|
||||||
|
type: string
|
||||||
|
default: "v11"
|
||||||
executor: <<parameters.executor>>
|
executor: <<parameters.executor>>
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@ -73,8 +76,15 @@ jobs:
|
|||||||
- run:
|
- run:
|
||||||
name: Build
|
name: Build
|
||||||
command: |
|
command: |
|
||||||
yarn build
|
excepted="<<parameters.target>>"
|
||||||
touch yarn.lock
|
actual="v$(cat package.json | jq -r '.version' | awk -F. '{print $1}')"
|
||||||
|
if [ $excepted = $actual ]
|
||||||
|
then
|
||||||
|
yarn build
|
||||||
|
touch yarn.lock
|
||||||
|
else
|
||||||
|
echo -e '\033[0;33mBuild Aborted\033[0;39m'
|
||||||
|
fi
|
||||||
- save_cache:
|
- save_cache:
|
||||||
name: Cache npm packages
|
name: Cache npm packages
|
||||||
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
||||||
@ -92,46 +102,52 @@ jobs:
|
|||||||
executor: <<parameters.executor>>
|
executor: <<parameters.executor>>
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: /tmp/workspace
|
at: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
- run:
|
- run:
|
||||||
name: Test
|
name: Test
|
||||||
command: |
|
command: |
|
||||||
yarn test
|
excepted="<<parameters.target>>"
|
||||||
|
actual="v$(cat package.json | jq -r '.version' | awk -F. '{print $1}')"
|
||||||
|
if [ $excepted = $actual ]
|
||||||
|
then
|
||||||
|
yarn test
|
||||||
|
else
|
||||||
|
echo -e '\033[0;33mTest Aborted\033[0;39m'
|
||||||
|
fi
|
||||||
touch yarn.lock
|
touch yarn.lock
|
||||||
- save_cache:
|
- save_cache:
|
||||||
name: Cache npm packages
|
name: Cache npm packages
|
||||||
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- node_modules
|
- node_modules
|
||||||
docker-build:
|
docker:
|
||||||
|
parameters:
|
||||||
|
deploy:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
executor: docker
|
executor: docker
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- setup_remote_docker
|
- setup_remote_docker:
|
||||||
|
docker_layer_caching: true
|
||||||
- run:
|
- run:
|
||||||
name: Build
|
name: Build
|
||||||
command: |
|
command: |
|
||||||
docker build -t misskey/misskey .
|
docker build -t misskey/misskey .
|
||||||
- persist_to_workspace:
|
- when:
|
||||||
root: .
|
condition: <<parameters.deploy>>
|
||||||
paths:
|
steps:
|
||||||
- .
|
- run:
|
||||||
docker-deploy:
|
name: Deploy
|
||||||
executor: docker
|
command: |
|
||||||
steps:
|
if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
|
||||||
- attach_workspace:
|
then
|
||||||
at: /tmp/workspace
|
docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
|
||||||
- run:
|
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
|
||||||
name: Deploy
|
docker push misskey/misskey
|
||||||
command: |
|
else
|
||||||
if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
|
echo -e '\033[0;33mDeploy Aborted\033[0;39m'
|
||||||
then
|
fi
|
||||||
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
|
|
||||||
echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
|
|
||||||
fi
|
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
@ -140,115 +156,120 @@ workflows:
|
|||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v11-node11
|
name: auto-build-v11-node11
|
||||||
executor: v11-node11
|
executor: v11-node11
|
||||||
|
target: v11
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore:
|
ignore:
|
||||||
- l10n_develop
|
|
||||||
- imgbot
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
- patch/autogen/v10
|
- patch/autogen/v10
|
||||||
- patch/autogen/v11
|
- patch/autogen/v11
|
||||||
- v10
|
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v11-node11
|
name: auto-test-v11-node11
|
||||||
executor: v11-node11
|
executor: v11-node11
|
||||||
|
target: v11
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v11-node11
|
- auto-build-v11-node11
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
ignore:
|
|
||||||
- l10n_develop
|
|
||||||
- imgbot
|
|
||||||
- patch/autogen/v10
|
|
||||||
- patch/autogen/v11
|
|
||||||
- v10
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v11-node8
|
name: auto-build-v11-node8
|
||||||
executor: v11-node8
|
executor: v11-node8
|
||||||
|
target: v11
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore:
|
ignore:
|
||||||
- l10n_develop
|
|
||||||
- imgbot
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
- patch/autogen/v10
|
- patch/autogen/v10
|
||||||
- patch/autogen/v11
|
- patch/autogen/v11
|
||||||
- v10
|
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v11-node8
|
name: auto-test-v11-node8
|
||||||
executor: v11-node8
|
executor: v11-node8
|
||||||
|
target: v11
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v11-node8
|
- auto-build-v11-node8
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
ignore:
|
|
||||||
- l10n_develop
|
|
||||||
- imgbot
|
|
||||||
- patch/autogen/v10
|
|
||||||
- patch/autogen/v11
|
|
||||||
- v10
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v10-node11
|
name: auto-build-v10-node11
|
||||||
executor: v10-node11
|
executor: v10-node11
|
||||||
|
target: v10
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: v10
|
ignore:
|
||||||
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
|
- patch/autogen/v10
|
||||||
|
- patch/autogen/v11
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v10-node11
|
name: auto-test-v10-node11
|
||||||
executor: v10-node11
|
executor: v10-node11
|
||||||
|
target: v10
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v10-node11
|
- auto-build-v10-node11
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only: v10
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v10-node11-redis
|
name: auto-build-v10-node11-redis
|
||||||
executor: v10-node11-redis
|
executor: v10-node11-redis
|
||||||
|
target: v10
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: v10
|
ignore:
|
||||||
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
|
- patch/autogen/v10
|
||||||
|
- patch/autogen/v11
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v10-node11-redis
|
name: auto-test-v10-node11-redis
|
||||||
executor: v10-node11-redis
|
executor: v10-node11-redis
|
||||||
|
target: v10
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v10-node11-redis
|
- auto-build-v10-node11-redis
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only: v10
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v10-node8
|
name: auto-build-v10-node8
|
||||||
executor: v10-node8
|
executor: v10-node8
|
||||||
|
target: v10
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: v10
|
ignore:
|
||||||
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
|
- patch/autogen/v10
|
||||||
|
- patch/autogen/v11
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v10-node8
|
name: auto-test-v10-node8
|
||||||
executor: v10-node8
|
executor: v10-node8
|
||||||
|
target: v10
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v10-node8
|
- auto-build-v10-node8
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only: v10
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: auto-build-v10-node8-redis
|
name: auto-build-v10-node8-redis
|
||||||
executor: v10-node8-redis
|
executor: v10-node8-redis
|
||||||
|
target: v10
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: v10
|
ignore:
|
||||||
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
|
- patch/autogen/v10
|
||||||
|
- patch/autogen/v11
|
||||||
- nodejs-test:
|
- nodejs-test:
|
||||||
name: auto-test-v10-node8-redis
|
name: auto-test-v10-node8-redis
|
||||||
executor: v10-node8-redis
|
executor: v10-node8-redis
|
||||||
|
target: v10
|
||||||
requires:
|
requires:
|
||||||
- auto-build-v10-node8-redis
|
- auto-build-v10-node8-redis
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only: v10
|
|
||||||
docker:
|
docker:
|
||||||
jobs:
|
jobs:
|
||||||
- docker-build:
|
- docker:
|
||||||
name: auto-build
|
name: auto-build
|
||||||
- docker-deploy:
|
filters:
|
||||||
|
branches:
|
||||||
|
ignore:
|
||||||
|
- imgbot
|
||||||
|
- l10n_develop
|
||||||
|
- master
|
||||||
|
- patch/autogen/v10
|
||||||
|
- patch/autogen/v11
|
||||||
|
- docker:
|
||||||
name: auto-deploy
|
name: auto-deploy
|
||||||
requires:
|
deploy: true
|
||||||
- auto-build
|
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: master
|
only: master
|
||||||
|
Loading…
x
Reference in New Issue
Block a user