From 582f3ae13cd79a0bc6b0836ee85457efdb0ed56d Mon Sep 17 00:00:00 2001 From: Ashmita Bohara Date: Mon, 30 Nov 2020 09:24:48 +0800 Subject: [PATCH] Fix and minor improvements to all-in-one github action Signed-off-by: Ashmita Bohara --- .github/workflows/all-in-one-build.yml | 4 +++- scripts/travis/build-all-in-one-image.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/all-in-one-build.yml b/.github/workflows/all-in-one-build.yml index 14cc9c6c93c..85c6c4669f8 100644 --- a/.github/workflows/all-in-one-build.yml +++ b/.github/workflows/all-in-one-build.yml @@ -42,7 +42,9 @@ jobs: - name: Export BRANCH variable for pull_request event run: | - echo "BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV + export BRANCH=${GITHUB_HEAD_REF} + echo "we are on branch=$BRANCH" + echo "BRANCH=${BRANCH}" >> $GITHUB_ENV if: github.event_name == 'pull_request' - name: Export BRANCH variable for push event diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh index aae4eecf19e..d888abbc26e 100755 --- a/scripts/travis/build-all-in-one-image.sh +++ b/scripts/travis/build-all-in-one-image.sh @@ -36,7 +36,7 @@ run_integration_test() { upload_to_docker() { # Only push the docker container to Docker Hub for master branch - if [[ ("$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) && "DOCKERHUB_LOGIN" == "true" ]]; then + if [[ ("$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) && "$DOCKERHUB_LOGIN" == "true" ]]; then echo "upload $1 to Docker Hub" export REPO=$1 bash ./scripts/travis/upload-to-docker.sh