diff --git a/app_version b/app_version index 09a3acfa..7ceb0404 100644 --- a/app_version +++ b/app_version @@ -1 +1 @@ -0.6.0 \ No newline at end of file +0.6.1 \ No newline at end of file diff --git a/cd/deploy.sh b/cd/deploy.sh index 30733719..479155ed 100755 --- a/cd/deploy.sh +++ b/cd/deploy.sh @@ -77,7 +77,7 @@ pushTags gchq/gaffer-operation-runner "${GAFFER_VERSION}" "${APP_VERSION}" git config --global credential.helper "store --file=.git/credentials" echo "https://${GITHUB_TOKEN}:@github.com" > .git/credentials -# Add Develop branch +# Add branches to be updated git remote set-branches --add origin develop gh-pages git pull @@ -97,12 +97,6 @@ JSON_DATA="{ echo "${JSON_DATA}" curl -v --data "${JSON_DATA}" -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/gchq/${REPO_NAME}/releases" -# Update version on develop -git checkout develop -./cd/update_app_version.sh -git commit -a -m "Updated App version" -git push - # Upload Charts to Github releases uploadChart hdfs "${APP_VERSION}" "${GITHUB_TOKEN}" uploadChart gaffer "${APP_VERSION}" "${GITHUB_TOKEN}" @@ -113,4 +107,11 @@ git checkout gh-pages git merge master -m "Updated docs to latest version" helm repo index . --url "https://github.com/gchq/gaffer-docker/releases/tag/${TAG_NAME}" --merge index.yaml git commit -am "Updated index.yaml" -git push \ No newline at end of file +git push + +# Update version on develop +git checkout develop +./cd/update_app_version.sh +git commit -a -m "Updated App version" +git push + diff --git a/kubernetes/gaffer-road-traffic/Chart.yaml b/kubernetes/gaffer-road-traffic/Chart.yaml index 045e14c4..5422eff8 100644 --- a/kubernetes/gaffer-road-traffic/Chart.yaml +++ b/kubernetes/gaffer-road-traffic/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: gaffer-road-traffic description: A Gaffer instance containing sample GB road traffic data from the Department of Transport type: application -version: 0.6.0 +version: 0.6.1 appVersion: 1.12.0 home: https://github.com/gchq/Gaffer sources: @@ -24,5 +24,5 @@ sources: - https://data.gov.uk/dataset/208c0e7b-353f-4e2d-8b7a-1a7118467acc/gb-road-traffic-counts dependencies: - name: gaffer - version: ^0.6.0 + version: ^0.6.1 repository: file://../gaffer/ diff --git a/kubernetes/gaffer/Chart.yaml b/kubernetes/gaffer/Chart.yaml index e9129687..3dc75240 100644 --- a/kubernetes/gaffer/Chart.yaml +++ b/kubernetes/gaffer/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: gaffer description: A large-scale entity and relation database supporting aggregation of properties type: application -version: 0.6.0 +version: 0.6.1 appVersion: 1.12.0 home: https://github.com/gchq/Gaffer sources: @@ -27,6 +27,6 @@ dependencies: repository: https://kubernetes-charts-incubator.storage.googleapis.com condition: zookeeper.enabled - name: hdfs - version: ^0.6.0 + version: ^0.6.1 repository: file://../hdfs/ condition: hdfs.enabled diff --git a/kubernetes/hdfs/Chart.yaml b/kubernetes/hdfs/Chart.yaml index f3320d3b..81975d1a 100644 --- a/kubernetes/hdfs/Chart.yaml +++ b/kubernetes/hdfs/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v2 name: hdfs description: Deploys the Hadoop Distributed File System (HDFS) type: application -version: 0.6.0 +version: 0.6.1 appVersion: 3.2.1