From fd4691cbc0390d796172cda3d8f5439a44b27212 Mon Sep 17 00:00:00 2001 From: Will Rouesnel Date: Sun, 11 Nov 2018 21:16:46 +1100 Subject: [PATCH] Fix metrics push. --- .travis.yml | 2 +- gh-metrics-push.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5862646..ebb0efb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ after_success: ; docker push wrouesnel/postgres_exporter:$TRAVIS_TAG ; fi - if [ "$TRAVIS_BRANCH" == "master" ]; then docker push wrouesnel/postgres_exporter ; fi -- ./postgres-metrics-get-changes.sh .assets-branch +- ./postgres-metrics-get-changes.sh .assets-branch/metriclists - if [ "$TRAVIS_BRANCH" == "support_shell_fixes" ]; then ./gh-metrics-push.sh ; fi env: global: diff --git a/gh-metrics-push.sh b/gh-metrics-push.sh index 32dbbe1e..37f335de 100755 --- a/gh-metrics-push.sh +++ b/gh-metrics-push.sh @@ -16,17 +16,13 @@ mkdir -p "$METRICS_DIR/" # Remove old files so we spot deletions rm -f "$METRICS_DIR/.*.unique" -ls -la - # Copy new files cp -f -t "$METRICS_DIR/" ./.metrics.*.prom.unique || exit 1 # Enter the assets dir and push. cd "$ASSETS_DIR" || exit 1 -ls -laR - -git add "$METRICS_DIR" || exit 1 +git add "metriclists" || exit 1 git commit -m "Added unique metrics for build from $version" || exit 1 git push origin "$GIT_ASSETS_BRANCH" || exit 1