From 2a6da344048a75444d7aa384ad3f6ab8f89c8b41 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 7 Jun 2021 18:04:16 +0100 Subject: [PATCH] Fixing staging build so it only occurs on develop, master doesn't need it. --- .github/workflows/budibase_ci.yml | 3 ++- hosting/scripts/linux/release-to-docker-hub.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 0380f92253..75e890abc2 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -45,9 +45,10 @@ jobs: - name: Build and Push Staging Docker Image # Only run on push - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }} run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + yarn build yarn build:docker:staging env: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh index a011ee1f13..b1a79c964c 100755 --- a/hosting/scripts/linux/release-to-docker-hub.sh +++ b/hosting/scripts/linux/release-to-docker-hub.sh @@ -3,7 +3,7 @@ tag=$1 tag=${tag:-latest} -echo "Tagging images with SHA: $GITHUB_SHA and version: $BUDIBASE_VERSION" +echo "Tagging images with SHA: $GITHUB_SHA and tag: $tag" docker tag app-service budibase/apps:$tag docker tag worker-service budibase/worker:$tag