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 2d119088b..b1bf43f1b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,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-source at https://github.com/rancher/charts.git +- dev-v2.6-source at https://github.com/rancher/charts.git To release a new version of a chart, please open the relevant PRs to one of these branches. @@ -32,7 +32,7 @@ Merging should trigger a sync workflow on pushing to these branches. #### Validate This branch validates against the generated assets of the following branches to make sure it isn't overriding already released charts. -- release-v2.5 at https://github.com/rancher/charts.git (only latest assets) +- release-v2.6 at https://github.com/rancher/charts.git (only latest assets) Before submitting any PRs, a Github Workflow will check to see if your package doesn't break any already released packages in these repository branches. diff --git a/configuration.yaml b/configuration.yaml index 2203a484f..1a0ae9470 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -2,10 +2,10 @@ template: staging sync: - url: https://github.com/rancher/charts.git - branch: dev-v2.5-source + branch: dev-v2.6-source validate: - url: https://github.com/rancher/charts.git - branch: release-v2.5 + branch: release-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 diff --git a/scripts/release-assets b/scripts/release-assets index 432d923b5..211b30043 100755 --- a/scripts/release-assets +++ b/scripts/release-assets @@ -5,4 +5,4 @@ cd $(dirname $0) cd .. -find assets -type f -mindepth 2 | xargs ./scripts/release-asset \ No newline at end of file +find assets -type f -mindepth 2 | xargs ./scripts/release-asset