From 71aa5aaa5c608d5fa62756b88de5d2628e528f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 5 Jan 2019 14:58:28 +0100 Subject: [PATCH] fixed typo in readme & set original file dates before deploy --- .circleci/deploy.sh | 11 +++++++++++ zammad/Chart.yaml | 2 +- zammad/README.md | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh index 32d34601..7ef6ae8b 100755 --- a/.circleci/deploy.sh +++ b/.circleci/deploy.sh @@ -20,6 +20,16 @@ if [ "${CIRCLECI}" == 'true' ] && [ -z "${CIRCLE_PULL_REQUEST}" ]; then # get chart version CHART_VERSION="$(grep version: "${REPO_ROOT}"/"${CHART_DIR}"/Chart.yaml | sed 's/version: //')" + # set original file dates + ( + cd "${REPO_ROOT}"/"${REPO_DIR}" || exit + while read -r FILE; do + ORG_FILE_TIME=$(git log --pretty=format:%cd -n 1 --date=iso "${FILE}") + echo "set original time ${ORG_FILE_TIME} to ${FILE}" + touch -d "${ORG_FILE_TIME}" -m "${FILE}" + done < <(git ls-files) + ) + # build helm dependencies in subshell ( cd "${REPO_ROOT}"/"${CHART_DIR}" || exit @@ -29,6 +39,7 @@ if [ "${CIRCLECI}" == 'true' ] && [ -z "${CIRCLE_PULL_REQUEST}" ]; then # build chart helm package "${REPO_ROOT}"/"${CHART_DIR}" --destination "${REPO_ROOT}"/"${REPO_DIR}" + # build index helm repo index --merge "${REPO_ROOT}"/"${REPO_DIR}"/index.yaml --url https://zammad.github.io "${REPO_ROOT}"/"${REPO_DIR}" # push changes to github diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index e59ae876..5406a6a8 100644 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: zammad -version: 0.1.5 +version: 0.1.6 appVersion: 2.8.0 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails. home: https://zammad.org diff --git a/zammad/README.md b/zammad/README.md index 9bfdd11f..0074a608 100644 --- a/zammad/README.md +++ b/zammad/README.md @@ -34,7 +34,7 @@ The following table lists the configurable parameters of the zammad chart and th |-----------------------------------|------------------------------------------|-------------------------------------| | `useElasticsearch` | use Elasticsearch dependcy | `true` | | `useMemcached` | use Memcached dependency | `true` | -| `usePostgresql | use PostgreSQL dependency | `true` | +| `usePostgresql` | use PostgreSQL dependency | `true` | | `image.repository` | Container image to use | `zammad/zammad-docker-compose` | | `image.tag` | Container image tag to deploy | `2.8.0-21` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` |