Revert "WEB-132 replace branch name (#2396)"

This reverts commit 123b51aed1.
This commit is contained in:
David Higgins
2025-04-11 15:16:34 +01:00
committed by GitHub
parent 123b51aed1
commit af5da58140
5 changed files with 21 additions and 21 deletions
+2 -2
View File
@@ -4,9 +4,9 @@ name: build-run
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [main]
branches: [master]
pull_request:
branches: [main]
branches: [master]
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
@@ -2,7 +2,7 @@ name: Publish Image in Docker Hub
on:
push:
branches: [main]
branches: [master]
jobs:
build:
@@ -43,7 +43,7 @@ jobs:
run: |
TAGS="--tag $DOCKER_ORGANIZATION/web-app:${{ steps.extract_branch.outputs.branch }}"
if [ "${{ steps.extract_branch.outputs.branch }}" == "main" ]; then
if [ "${{ steps.extract_branch.outputs.branch }}" == "master" ]; 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 }}"
fi
+1 -1
View File
@@ -1,5 +1,5 @@
# https://github.com/marketplace/actions/close-stale-issues
# https://github.com/actions/stale/blob/main/action.yml
# https://github.com/actions/stale/blob/master/action.yml
# https://github.com/actions/stale
name: Mark stale issues and pull requests
on:
+2 -2
View File
@@ -2,9 +2,9 @@ name: Tests
on:
push:
branches: [main]
branches: [master]
pull_request:
branches: [main]
branches: [master]
jobs:
testRigor: