Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump xstream from 1.4.14 to 1.4.19 #8

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 119 additions & 117 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,14 @@
include: https://api.choerodon.com.cn/devops/v1/projects/1529/ci_contents/pipelines/cd3fd533-2849-4294-8fbb-54653a1b7a89/content.yaml
include: https://api.choerodon.com.cn/devops/v1/projects/261899051275677696/ci_contents/pipelines/203636d9-de7c-4e7f-9b05-24e2cb668bd7/content.yaml

#image: registry.cn-shanghai.aliyuncs.com/c7n/cibase:0.11.4
#include: https://api.choerodon.com.cn/devops/v1/projects/1529/ci_contents/pipelines/cd3fd533-2849-4294-8fbb-54653a1b7a89/content.yaml
#
#stages:
# - build
# - release
#
#build front:
# stage: build
# script:
# - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
# - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
# - npm config set always-auth true
# - yarn install --registry "https://${NPM_REPO}" --sass-binary-site=http://npm.taobao.org/mirrors/node-sass
# - chmod -R 755 node_modules
# - npm run compile
# - npm publish --registry "https://${NPM_REGISTRY}"
# - curl -sX POST -F token=${FRONT_REPOSITORY_TOKEN} -F ref=${REF_NAME} https://code.choerodon.com.cn/api/v4/projects/7909/trigger/pipeline
# except:
# changes:
# - pom.xml
# - src/**/*
# - docker/**/*
# - chart/**/*
# - init-mysql-database.sh
# - .circleci/**/*
# - .gitignore
# - .github/**/*
# - .gitlab-ci.yml
# - "*.md"
# only:
# refs:
# - master
# - /^.*bugfix.*$/
# - /^.*hotfix.*$/
# - /^.*release.*$/
#
##tag front:
##image: registry.cn-shanghai.aliyuncs.com/c7n/cibase:0.11.4
##
##stages:
## - build
## - release
##
##build front:
## stage: build
## script:
## - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
Expand All @@ -46,86 +18,116 @@ include: https://api.choerodon.com.cn/devops/v1/projects/1529/ci_contents/pipeli
## - chmod -R 755 node_modules
## - npm run compile
## - npm publish --registry "https://${NPM_REGISTRY}"
## - curl -sX POST -F token=${FRONT_REPOSITORY_TOKEN} -F ref=${REF_NAME} https://code.choerodon.com.cn/api/v4/projects/7909/trigger/pipeline
## except:
## changes:
## - pom.xml
## - src/**/*
## - docker/**/*
## - chart/**/*
## - init-mysql-database.sh
## - .circleci/**/*
## - .gitignore
## - .github/**/*
## - .gitlab-ci.yml
## - "*.md"
## only:
## refs:
## - master
## - /^.*bugfix.*$/
## - /^.*hotfix.*$/
## - /^.*release.*$/
##
###tag front:
### stage: build
### script:
### - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
### - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
### - npm config set always-auth true
### - yarn install --registry "https://${NPM_REPO}" --sass-binary-site=http://npm.taobao.org/mirrors/node-sass
### - chmod -R 755 node_modules
### - npm run compile
### - npm publish --registry "https://${NPM_REGISTRY}"
### only:
### refs:
### - tags
##
##build backend:
## stage: build
## script:
## - update_pom_version
## - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
## - mvn package spring-boot:repackage
## - mv target/app.jar $PWD/docker
## - saveImageMetadata
## - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
## except:
## changes:
## - .editorconfig
## - .eslintrc.json
## - .stylelintrc.json
## - gulpfile.js
## - package.json
## - react/**/*
## - .gitignore
## - .github/**/*
## - .gitlab-ci.yml
## - "*.md"
## only:
## refs:
## - master
## - /^.*bugfix.*$/
## - /^.*hotfix.*$/
## - /^.*release.*$/
##
##tag backend:
## stage: build
## script:
## - update_pom_version
## - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
## - mvn package spring-boot:repackage
## - mv target/app.jar $PWD/docker
## - saveImageMetadata
## - docker build --platform linux/arm64 -t ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm -f $PWD/docker/Dockerfile $PWD/docker
## - docker push ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm
## - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
## only:
## refs:
## - tags
#
#build backend:
# stage: build
# script:
# - update_pom_version
# - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
# - mvn package spring-boot:repackage
# - mv target/app.jar $PWD/docker
# - saveImageMetadata
# - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
# except:
# changes:
# - .editorconfig
# - .eslintrc.json
# - .stylelintrc.json
# - gulpfile.js
# - package.json
# - react/**/*
# - .gitignore
# - .github/**/*
# - .gitlab-ci.yml
# - "*.md"
# only:
# refs:
# - master
# - /^.*bugfix.*$/
# - /^.*hotfix.*$/
# - /^.*release.*$/
#
#tag backend:
# stage: build
# script:
# - update_pom_version
# - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
# - mvn package spring-boot:repackage
# - mv target/app.jar $PWD/docker
# - saveImageMetadata
# - docker build --platform linux/arm64 -t ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm -f $PWD/docker/Dockerfile $PWD/docker
# - docker push ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm
# - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
# only:
# refs:
# - tags
#
#
#release backend:
# stage: release
# script:
# - chart_build
# except:
# changes:
# - .editorconfig
# - .eslintrc.json
# - .stylelintrc.json
# - gulpfile.js
# - package.json
# - react/**/*
# - .gitignore
# - .github/**/*
# - .gitlab-ci.yml
# - "*.md"
#
#
#tag release:
# stage: release
# script:
# - chart_build
# only:
# - tags
#
#.auto_devops: &auto_devops |
# http_status_code=`curl -o .auto_devops.sh -s -m 10 --connect-timeout 10 -w %{http_code} "${CHOERODON_URL}/devops/ci?token=${Token}&type=microservice"`
# if [ "$http_status_code" != "200" ]; then
# cat .auto_devops.sh
# exit 1
# fi
# source .auto_devops.sh
#
#before_script:
# - *auto_devops
##
##
##release backend:
## stage: release
## script:
## - chart_build
## except:
## changes:
## - .editorconfig
## - .eslintrc.json
## - .stylelintrc.json
## - gulpfile.js
## - package.json
## - react/**/*
## - .gitignore
## - .github/**/*
## - .gitlab-ci.yml
## - "*.md"
##
##
##tag release:
## stage: release
## script:
## - chart_build
## only:
## - tags
##
##.auto_devops: &auto_devops |
## http_status_code=`curl -o .auto_devops.sh -s -m 10 --connect-timeout 10 -w %{http_code} "${CHOERODON_URL}/devops/ci?token=${Token}&type=microservice"`
## if [ "$http_status_code" != "200" ]; then
## cat .auto_devops.sh
## exit 1
## fi
## source .auto_devops.sh
##
##before_script:
## - *auto_devops
5 changes: 2 additions & 3 deletions charts/workflow-service/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@ spec:
{{- end }}
{{- if .Values.startupProbe.enabled }}
startupProbe:
httpGet:
path: /actuator/health
port: actuator
tcpSocket:
port: server
initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
Expand Down
Loading