From 451d3c820780b4fcb61a199b7f3c83b35a6fa135 Mon Sep 17 00:00:00 2001 From: hhhhsc701 <56435672+hhhhsc701@users.noreply.github.com> Date: Mon, 10 Nov 2025 20:34:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=92=E6=A1=A3=E5=8C=85=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=20(#71)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-images-reusable.yml | 9 +++------ .github/workflows/package.yml | 9 ++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-images-reusable.yml b/.github/workflows/docker-images-reusable.yml index 8f0b41a..0e7ed7a 100644 --- a/.github/workflows/docker-images-reusable.yml +++ b/.github/workflows/docker-images-reusable.yml @@ -46,19 +46,16 @@ jobs: run: | make build-${{ inputs.service_name }} VERSION=latest - - name: Tag Docker Image - run: | - docker tag datamate-${{ inputs.service_name }}:latest ${{ steps.set-tag.outputs.TAGS }} - - - name: Push Docker Image + - name: Tag & Push Docker Image if: github.event_name != 'pull_request' && !startsWith(github.workflow, 'Package') run: | + docker tag datamate-${{ inputs.service_name }}:latest ${{ steps.set-tag.outputs.TAGS }} docker push ${{ steps.set-tag.outputs.TAGS }} - name: Save Docker Image if: startsWith(github.workflow, 'Package') run: | - docker save -o datamate-${{ inputs.service_name }}.tar ${{ steps.set-tag.outputs.TAGS }} + docker save -o datamate-${{ inputs.service_name }}.tar datamate-${{ inputs.service_name }}:latest - name: Upload Docker Image if: startsWith(github.workflow, 'Package') diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5eeaf78..2b591d1 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -36,7 +36,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Save Image + - name: Download Image uses: actions/download-artifact@v5 with: path: images @@ -54,5 +54,8 @@ jobs: - name: Upload Package uses: actions/upload-artifact@v4 with: - name: package - path: datamate.tar \ No newline at end of file + name: datamate + include-hidden-files: true + path: | + deployment/ + images/ \ No newline at end of file