diff --git a/.forgejo/actions/build-docker/action.yml b/.forgejo/actions/build-docker/action.yml index c83c2ee..b4a09e5 100644 --- a/.forgejo/actions/build-docker/action.yml +++ b/.forgejo/actions/build-docker/action.yml @@ -1,4 +1,4 @@ -name: Builds and Publish Docker Image +name: Build and Publish Docker Image description: Define IMAGE_NAME to Git Hub env, based on repository name inputs: username: diff --git a/.forgejo/actions/set-image-name/action.yml b/.forgejo/actions/set-image-name/action.yml index 1fe5aa7..a80f05a 100644 --- a/.forgejo/actions/set-image-name/action.yml +++ b/.forgejo/actions/set-image-name/action.yml @@ -13,9 +13,10 @@ runs: export REPO_FULL=${{ github.repository }} export REPO_NAME=${REPO_FULL#*/} - if [ "${{ github.ref_name }}" != "master" && "${{ github.ref_name }}" != "main" ]; then + if [ "${{ github.ref_name }}" != "master" ] && [ "${{ github.ref_name }}" != "main" ]; then export IMAGE_NAME=${{ inputs.username }}/$REPO_NAME-dev else export IMAGE_NAME=${{ inputs.username }}/$REPO_NAME fi echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV + echo "Image Name: $IMAGE_NAME, for Branch: ${{ github.ref_name }}"