Fix Defalut conflicts

qd-today · Jan 6, 2022 · 4b8bdfa · 4b8bdfa
1 parent 0ff05ee
commit 4b8bdfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/Build Image.yml b/.github/workflows/Build Image.yml
@@ -8,6 +8,8 @@ jobs:
       steps:
           - name: Checkout master
             uses: actions/checkout@master
+            with:
+              ref: default
           - name: Get version
             id: get_version
             if: startsWith(github.ref, 'refs/tags/')

diff --git a/.github/workflows/Publish Package.yml b/.github/workflows/Publish Package.yml
@@ -13,14 +13,16 @@ jobs:
       steps:
           - name: Checkout master
             uses: actions/checkout@master
+            with:
+              ref: default
           - name: Publish Latest Package
             uses: ilteoood/docker_buildx@master
             if: startsWith(github.repository, 'qiandao-today/pycurl-docker')
             with:
               publish: true
               imageName: ghcr.io/qiandao-today/pycurl-docker-default # dockerid/imageName
               platform: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
-              tag: latest
+              tag: default-latest
               dockerServer: ghcr.io
               dockerUser: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
               dockerPassword: ${{ secrets.GITHUB_TOKEN }} # dockerServer Token