From 471389b69e23417ab4e86981d109c79635d7219b Mon Sep 17 00:00:00 2001 From: merlin Date: Wed, 22 Oct 2025 23:17:59 +0800 Subject: [PATCH 1/4] fix: ci --- .gitea/workflows/tag.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 36da85f..5fa20f4 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -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}" From f76c193bc5e320627da7df3ca27bcef3f02f4043 Mon Sep 17 00:00:00 2001 From: merlin Date: Sat, 1 Nov 2025 16:10:59 +0000 Subject: [PATCH 2/4] feat: build basic builder --- .gitea/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 966a11e..5f8f4f2 100644 --- 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/builder steps: - name: Checkout code uses: actions/checkout@v4 From 5b5c5d66641791255fb7af54cdbb3eaf02534690 Mon Sep 17 00:00:00 2001 From: merlin Date: Sun, 2 Nov 2025 00:13:38 +0800 Subject: [PATCH 3/4] fix: change image tag --- .gitea/workflows/dev.yaml | 2 +- .gitea/workflows/tag.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 5f8f4f2..4640a2e 100644 --- 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 + image: harbor.merlin.xin/testing/merlin/builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 5fa20f4..f7f820f 100644 --- 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:v0.0.0 + image: harbor.merlin.xin/testing/merlin/builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4 From 43576c17367478cecc1e52928413b8ee41506edd Mon Sep 17 00:00:00 2001 From: merlin Date: Sun, 2 Nov 2025 00:17:18 +0800 Subject: [PATCH 4/4] fix: change image --- .gitea/workflows/dev.yaml | 2 +- .gitea/workflows/tag.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 4640a2e..36a463d 100644 --- 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:471389b69e23417ab4e86981d109c79635d7219b + image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index f7f820f..89cf697 100644 --- 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:471389b69e23417ab4e86981d109c79635d7219b + image: harbor.merlin.xin/testing/merlin/action_builder:471389b69e23417ab4e86981d109c79635d7219b steps: - name: Checkout code uses: actions/checkout@v4