From 4b8bdfa1166bd3ae68e15c524073c5176cbf8797 Mon Sep 17 00:00:00 2001
From: a76yyyy <q981331502@163.com>
Date: Thu, 6 Jan 2022 12:43:48 +0800
Subject: [PATCH] Fix Defalut conflicts

---
 .github/workflows/Build Image.yml     | 2 ++
 .github/workflows/Publish Package.yml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Build Image.yml b/.github/workflows/Build Image.yml
index 2f21f12..a48955a 100644
--- 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
index 2d26c45..18b6595 100644
--- a/.github/workflows/Publish Package.yml	
+++ b/.github/workflows/Publish Package.yml	
@@ -13,6 +13,8 @@ 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')
@@ -20,7 +22,7 @@ jobs:
               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