Merge branch 'dev'

fix: change image
fix: change image tag
2025-11-02 00:24:46 +08:00 · 2025-11-02 00:17:18 +08:00 · 2025-11-02 00:13:38 +08:00 · 2025-11-01 16:10:59 +00:00 · 2025-10-22 23:17:59 +08:00
2 changed files with 3 additions and 4 deletions
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -8,7 +8,7 @@ jobs:
  build:
    runs-on: gitea-official-runner
    container: 
-      image: harbor.merlin.xin/testing/merlin/builder:v0.0.0
+      image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b
    steps:
    - name: Checkout code
      uses: actions/checkout@v4
--- a/.gitea/workflows/tag.yaml
+++ b/.gitea/workflows/tag.yaml
@@ -8,7 +8,7 @@ jobs:
  build:
    runs-on: gitea-official-runner
    container: 
-      image: harbor.merlin.xin/testing/merlin/builder
+      image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b
    steps:
    - name: Checkout code
      uses: actions/checkout@v4
@@ -21,11 +21,10 @@ jobs:
    - name: Build and push Docker images
      env:
        HARBOR_URL: ${{ vars.HARBOR_URL }}
-        TAG: ${{ github.sha }}
        REPOSITORY: ${{ github.repository }}
      run: |
        ROOT_DIR=$(pwd)
-        IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:${TAG}"
+        IMAGE_NAME="${HARBOR_URL}/release/$REPOSITORY:$GITHUB_REF_NAME"
        echo "Building image: ${IMAGE_NAME}" 
        docker build -t ${IMAGE_NAME} .
        echo "Pushing image: ${IMAGE_NAME}"
Author	SHA1	Message	Date
merlin	f2cfcf68dd	Merge branch 'dev' All checks were successful Docker Image CI / build (push) Successful in 6s Details	2025-11-02 00:24:46 +08:00
merlin	43576c1736	fix: change image All checks were successful Docker Image CI / build (push) Successful in 7s Details	2025-11-02 00:17:18 +08:00
merlin	5b5c5d6664	fix: change image tag Some checks failed Docker Image CI / build (push) Failing after 1s Details	2025-11-02 00:13:38 +08:00
merlin	f76c193bc5	feat: build basic builder Some checks failed Docker Image CI / build (push) Failing after 1s Details	2025-11-01 16:10:59 +00:00
merlin	471389b69e	fix: ci All checks were successful Docker Image CI / build (push) Successful in 3s Details	2025-10-22 23:17:59 +08:00