ljw 1 год назад
Родитель
Сommit
418b182641
1 измененных файлов с 17 добавлено и 5 удалено
  1. 17 5
      .github/workflows/build.yml

+ 17 - 5
.github/workflows/build.yml

@@ -119,9 +119,13 @@ jobs:
119
           username: ${{ secrets.DOCKER_USERNAME }}
119
           username: ${{ secrets.DOCKER_USERNAME }}
120
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
120
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
121
 
121
 
122
-      - name: Extract version from tag
122
+      - name: Get git tag
123
         id: vars
123
         id: vars
124
-        run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
124
+        run: |
125
+          T=${GITHUB_REF#refs/*/}
126
+          M=${T%%.*}
127
+          echo "GIT_TAG=$T" >> $GITHUB_ENV
128
+          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
125
 
129
 
126
       - name: Extract metadata (tags, labels) for Docker
130
       - name: Extract metadata (tags, labels) for Docker
127
         id: meta
131
         id: meta
@@ -150,7 +154,7 @@ jobs:
150
             ARCH=${{ matrix.job.docker_platform }}
154
             ARCH=${{ matrix.job.docker_platform }}
151
           tags: |
155
           tags: |
152
             lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
156
             lejianwen/rustdesk-api:latest-${{ matrix.job.platform }}
153
-            lejianwen/rustdesk-api:${{ env.TAG }}-${{ matrix.job.platform }}
157
+            lejianwen/rustdesk-api:${{ env.GIT_TAG }}-${{ matrix.job.platform }}
154
           labels: ${{ steps.meta.outputs.labels }}
158
           labels: ${{ steps.meta.outputs.labels }}
155
 
159
 
156
   docker-manifest:
160
   docker-manifest:
@@ -168,11 +172,19 @@ jobs:
168
           username: ${{ secrets.DOCKER_USERNAME }}
172
           username: ${{ secrets.DOCKER_USERNAME }}
169
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
173
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
170
 
174
 
175
+      - name: Get git tag
176
+        id: vars
177
+        run: |
178
+          T=${GITHUB_REF#refs/*/}
179
+          M=${T%%.*}
180
+          echo "GIT_TAG=$T" >> $GITHUB_ENV
181
+          echo "MAJOR_TAG=$M" >> $GITHUB_ENV
182
+
171
       - name: Create and push manifest (:version)
183
       - name: Create and push manifest (:version)
172
         uses: Noelware/docker-manifest-action@master
184
         uses: Noelware/docker-manifest-action@master
173
         with:
185
         with:
174
-          base-image: lejianwen/rustdesk-api:${{ env.TAG }}
175
-          extra-images: lejianwen/rustdesk-api:${{ env.TAG }}-amd64,lejianwen/rustdesk-api:${{ env.TAG }}-arm64
186
+          base-image: lejianwen/rustdesk-api:${{ env.GIT_TAG }}
187
+          extra-images: lejianwen/rustdesk-api:${{ env.GIT_TAG }}-amd64,lejianwen/rustdesk-api:${{ env.GIT_TAG }}-arm64
176
           push: true
188
           push: true
177
 
189
 
178
 #      - name: Create and push manifest (:latest)
190
 #      - name: Create and push manifest (:latest)