Fix and minor improvements to all-in-one github action

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
jaegertracing · Nov 30, 2020 · 582f3ae · 582f3ae
1 parent ae162b8
commit 582f3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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