From aaa44f716873f81766348c3affd96d60cf5fd957 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 16 Nov 2017 10:25:47 +0800 Subject: [PATCH 1/3] Revert "[csharp] clean boolean additional properties 6784 (#6899)" This reverts commit 2c9f98ce38c845f0a9d235f3c381d57168efee13. From 2d6b622e820f524976bea591351b38b851118af1 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 16 Nov 2017 10:25:47 +0800 Subject: [PATCH 2/3] Revert "[Swift4] Add throw to reserved words (#6952)" This reverts commit 970de01bdf5ecf7b2f2298a71f16fc760960f1f9. From 89e4d57ea67004632e5f4e41110b425a09610b95 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 16 Nov 2017 10:25:47 +0800 Subject: [PATCH 3/3] Revert "add a docker build tag for pushing docker image instead of just latest (#6837)" This reverts commit 4e482eef178b28616baf8b2db6f31b4329acd8e1. --- circle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/circle.yml b/circle.yml index 122ccd799f9..1fb626bce55 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,6 @@ machine: environment: DOCKER_GENERATOR_IMAGE_NAME: swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME: swaggerapi/swagger-codegen-cli - DOCKER_BUILD_TAG: 2.2.3 dependencies: cache_directories: @@ -46,7 +45,5 @@ test: - if [ $? -ne 0 ]; then exit 1; fi ## docker: build generator image and push to Docker Hub - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi - - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME:$DOCKER_BUILD_TAG; fi; fi ## docker: build cli image and push to Docker Hub - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi - - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:$DOCKER_BUILD_TAG; fi; fi