Skip to content

Commit caa4ce0

Browse files
committed
add some changes
1 parent 618685d commit caa4ce0

1 file changed

Lines changed: 24 additions & 16 deletions

File tree

.github/workflows/publish_docker.yml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,30 @@ jobs:
4545
TAG=latest
4646
SHOULD_BUILD_PUSH=false
4747
48+
echo "GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME"
4849
echo "GITHUB_REF: $GITHUB_REF"
4950
echo "GITHUB_HEAD_REF: $GITHUB_HEAD_REF"
5051
51-
# Extract ref type and name
52-
if [[ "$GITHUB_REF" == refs/heads/* ]]; then
53-
GITHUB_REF_TYPE="branch"
54-
GITHUB_REF_NAME="${GITHUB_REF#refs/heads/}"
52+
# Determine context: PR or push/tag
53+
if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
54+
BRANCH_NAME="$GITHUB_HEAD_REF"
55+
REF_TYPE="pr"
56+
elif [[ "$GITHUB_REF" == refs/heads/* ]]; then
57+
BRANCH_NAME="${GITHUB_REF#refs/heads/}"
58+
REF_TYPE="branch"
5559
elif [[ "$GITHUB_REF" == refs/tags/* ]]; then
56-
GITHUB_REF_TYPE="tag"
57-
GITHUB_REF_NAME="${GITHUB_REF#refs/tags/}"
60+
BRANCH_NAME="${GITHUB_REF#refs/tags/}"
61+
REF_TYPE="tag"
5862
else
59-
GITHUB_REF_TYPE=""
60-
GITHUB_REF_NAME=""
63+
BRANCH_NAME=""
64+
REF_TYPE=""
6165
fi
62-
echo "GITHUB_REF_TYPE: $GITHUB_REF_TYPE"
63-
echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
66+
echo "REF_TYPE: $REF_TYPE"
67+
echo "BRANCH_NAME: $BRANCH_NAME"
68+
6469
# Determine tag and build indicator based on context
65-
if [[ "$GITHUB_REF_TYPE" == "branch" ]]; then
66-
case "$GITHUB_REF_NAME" in
70+
if [[ "$REF_TYPE" == "branch" || "$REF_TYPE" == "pr" ]]; then
71+
case "$BRANCH_NAME" in
6772
"main")
6873
TAG=main
6974
SHOULD_BUILD_PUSH=true
@@ -77,16 +82,19 @@ jobs:
7782
SHOULD_BUILD_PUSH=true
7883
;;
7984
*)
80-
TAG=${{ github.ref_name }}
85+
TAG="$BRANCH_NAME"
8186
;;
8287
esac
83-
elif [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
84-
TAG=${{ github.ref_name }}
85-
if [[ "$GITHUB_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
88+
elif [[ "$REF_TYPE" == "tag" ]]; then
89+
TAG="$BRANCH_NAME"
90+
if [[ "$BRANCH_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
8691
SHOULD_BUILD_PUSH=true
8792
fi
8893
fi
8994
95+
echo "Determined TAG: $TAG"
96+
echo "SHOULD_BUILD_PUSH: $SHOULD_BUILD_PUSH"
97+
9098
# Build and push the image if indicated
9199
if [[ "$SHOULD_BUILD_PUSH" == "true" ]]; then
92100
docker build -t $IMAGE_NAME:$TAG -f .devcontainer/Dockerfile .

0 commit comments

Comments
 (0)