diff --git a/.gitignore b/.gitignore index 5f44260cc..c35cb8584 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin -*.DS_Store \ No newline at end of file +*.DS_Store +.idea diff --git a/README.md b/README.md index 61cfebd28..979b93b25 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This repository branch contains a `configuration.yaml` file that is used to spec #### Sync This branch syncs with the generated assets from the following branches: -- dev-v2.5 at https://github.com/rancher/charts.git (only latest assets) +- dev-v2.6 at https://github.com/rancher/charts.git (only latest assets) To release a new version of a chart, please open the relevant PRs to one of these branches. diff --git a/configuration.yaml b/configuration.yaml index feaabeee3..2b3915028 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -2,7 +2,7 @@ template: live sync: - url: https://github.com/rancher/charts.git - branch: dev-v2.5 + branch: dev-v2.6 dropReleaseCandidates: true helmRepo: cname: charts.rancher.io \ No newline at end of file diff --git a/scripts/regenerate-assets b/scripts/regenerate-assets index f6472ca03..cfcb16de4 100755 --- a/scripts/regenerate-assets +++ b/scripts/regenerate-assets @@ -3,6 +3,13 @@ set -e cd $(dirname $0) +if [[ -z ${BRANCH} ]]; then + branch=$(git rev-parse --abbrev-ref HEAD) +else + echo "Using branch ${BRANCH}" + branch=${BRANCH} +fi + if [[ -z ${REPOSITORY} ]]; then echo "Need to provide REPOSITORY as environment variable" exit 1 @@ -16,7 +23,6 @@ mkdir -p ./repository cd repository # Pull in branch -branch=$(git rev-parse --abbrev-ref HEAD) echo "Pulling in ${REPOSITORY}@${branch}" git clone --depth 1 --branch ${branch} ${REPOSITORY} . > /dev/null 2>&1