diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28efaf99b..b978a2ca4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,11 +2,11 @@ name: build-run # Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the main branch + # Triggers the workflow on push or pull request events for specific branches push: - branches: [main] + branches: [main, dev, angular-update] pull_request: - branches: [main] + branches: [main, dev, angular-update] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/create-docker-hub-image.yml b/.github/workflows/create-docker-hub-image.yml index eeffb3237..087c79ac5 100644 --- a/.github/workflows/create-docker-hub-image.yml +++ b/.github/workflows/create-docker-hub-image.yml @@ -2,7 +2,7 @@ name: Publish Image in Docker Hub on: push: - branches: [main] + branches: [main, dev, angular-update] jobs: build: @@ -45,6 +45,8 @@ jobs: if [ "${{ steps.extract_branch.outputs.branch }}" == "main" ]; then TAGS="$TAGS --tag $DOCKER_ORGANIZATION/web-app:${{ steps.git_hashes.outputs.short_hash }} --tag $DOCKER_ORGANIZATION/web-app:${{ steps.git_hashes.outputs.long_hash }}" + else + TAGS="$TAGS --tag $DOCKER_ORGANIZATION/web-app:${{ steps.extract_branch.outputs.branch }}-${{ steps.git_hashes.outputs.short_hash }}" fi docker build --push --build-arg="PUPPETEER_SKIP_DOWNLOAD_ARG=true" --platform linux/amd64,linux/arm64 $TAGS . diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f5f330f0..d0f73484e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [main] + branches: [main, dev, angular-update] pull_request: - branches: [main] + branches: [main, dev, angular-update] jobs: testRigor: