Browse Source

chore: build fix

lejianwen 9 months ago
parent
commit
4ff3d2db9a
2 changed files with 19 additions and 19 deletions
  1. 13 13
      .github/workflows/build.yaml
  2. 6 6
      .github/workflows/ghcr.yml

+ 13 - 13
.github/workflows/build.yaml

@@ -26,7 +26,7 @@ jobs:
26
   build:
26
   build:
27
 
27
 
28
     name: Build - ${{ matrix.job.name }}
28
     name: Build - ${{ matrix.job.name }}
29
-    runs-on: ubuntu-20.04
29
+    runs-on: ubuntu-24.04
30
     strategy:
30
     strategy:
31
       fail-fast: false
31
       fail-fast: false
32
       matrix:
32
       matrix:
@@ -172,7 +172,7 @@ jobs:
172
     needs: 
172
     needs: 
173
       - build
173
       - build
174
       - build-win
174
       - build-win
175
-    runs-on: ubuntu-20.04
175
+    runs-on: ubuntu-24.04
176
     strategy:
176
     strategy:
177
       fail-fast: false
177
       fail-fast: false
178
       matrix:
178
       matrix:
@@ -212,7 +212,7 @@ jobs:
212
 
212
 
213
     name: Docker push - ${{ matrix.job.name }}
213
     name: Docker push - ${{ matrix.job.name }}
214
     needs: build
214
     needs: build
215
-    runs-on: ubuntu-22.04
215
+    runs-on: ubuntu-24.04
216
     strategy:
216
     strategy:
217
       fail-fast: false
217
       fail-fast: false
218
       matrix:
218
       matrix:
@@ -285,7 +285,7 @@ jobs:
285
 
285
 
286
     name: Docker manifest s6
286
     name: Docker manifest s6
287
     needs: docker
287
     needs: docker
288
-    runs-on: ubuntu-22.04
288
+    runs-on: ubuntu-24.04
289
 
289
 
290
     steps:
290
     steps:
291
 
291
 
@@ -348,7 +348,7 @@ jobs:
348
 
348
 
349
     name: Docker push classic - ${{ matrix.job.name }}
349
     name: Docker push classic - ${{ matrix.job.name }}
350
     needs: build
350
     needs: build
351
-    runs-on: ubuntu-22.04
351
+    runs-on: ubuntu-24.04
352
     strategy:
352
     strategy:
353
       fail-fast: false
353
       fail-fast: false
354
       matrix:
354
       matrix:
@@ -418,7 +418,7 @@ jobs:
418
 
418
 
419
     name: Docker manifest classic
419
     name: Docker manifest classic
420
     needs: docker
420
     needs: docker
421
-    runs-on: ubuntu-22.04
421
+    runs-on: ubuntu-24.04
422
     steps:
422
     steps:
423
 
423
 
424
       - name: Log in to Docker Hub
424
       - name: Log in to Docker Hub
@@ -442,24 +442,24 @@ jobs:
442
         uses: Noelware/docker-manifest-action@master
442
         uses: Noelware/docker-manifest-action@master
443
         if: github.event_name != 'workflow_dispatch'
443
         if: github.event_name != 'workflow_dispatch'
444
         with:
444
         with:
445
-          base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}
446
-          extra-images: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-armv7
445
+          tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}
446
+          inputs: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}-armv7
447
           push: true
447
           push: true
448
 
448
 
449
       # manifest for :1 tag (major release)
449
       # manifest for :1 tag (major release)
450
       - name: Create and push manifest (:major)
450
       - name: Create and push manifest (:major)
451
         uses: Noelware/docker-manifest-action@master
451
         uses: Noelware/docker-manifest-action@master
452
         with:
452
         with:
453
-          base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}
454
-          extra-images: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-armv7
453
+          tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}
454
+          inputs: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}-armv7
455
           push: true
455
           push: true
456
 
456
 
457
       # manifest for :latest tag
457
       # manifest for :latest tag
458
       - name: Create and push manifest (:latest)
458
       - name: Create and push manifest (:latest)
459
         uses: Noelware/docker-manifest-action@master
459
         uses: Noelware/docker-manifest-action@master
460
         with:
460
         with:
461
-          base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}
462
-          extra-images: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-armv7
461
+          tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}
462
+          inputs: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-amd64,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}-armv7
463
           push: true
463
           push: true
464
 
464
 
465
 
465
 
@@ -467,7 +467,7 @@ jobs:
467
 
467
 
468
     name: debian package - ${{ matrix.job.name }}
468
     name: debian package - ${{ matrix.job.name }}
469
     needs: build
469
     needs: build
470
-    runs-on: ubuntu-22.04
470
+    runs-on: ubuntu-24.04
471
     strategy:
471
     strategy:
472
       fail-fast: false
472
       fail-fast: false
473
       matrix:
473
       matrix:

+ 6 - 6
.github/workflows/ghcr.yml

@@ -302,8 +302,8 @@ jobs:
302
         uses: Noelware/docker-manifest-action@master
302
         uses: Noelware/docker-manifest-action@master
303
         if: github.event_name != 'workflow_dispatch'
303
         if: github.event_name != 'workflow_dispatch'
304
         with:
304
         with:
305
-          base-image: ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}
306
-          extra-images: |
305
+          tags: ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}
306
+          inputs: |
307
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-amd64,
307
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-amd64,
308
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-arm64v8,
308
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-arm64v8,
309
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-armv7,
309
             ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-armv7,
@@ -314,8 +314,8 @@ jobs:
314
       - name: Create and push manifest (:major)
314
       - name: Create and push manifest (:major)
315
         uses: Noelware/docker-manifest-action@master
315
         uses: Noelware/docker-manifest-action@master
316
         with:
316
         with:
317
-          base-image: ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}
318
-          extra-images: |
317
+          tags: ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}
318
+          inputs: |
319
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-amd64,
319
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-amd64,
320
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-arm64v8,
320
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-arm64v8,
321
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-armv7,
321
             ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-armv7,
@@ -326,8 +326,8 @@ jobs:
326
       - name: Create and push manifest (:latest)
326
       - name: Create and push manifest (:latest)
327
         uses: Noelware/docker-manifest-action@master
327
         uses: Noelware/docker-manifest-action@master
328
         with:
328
         with:
329
-          base-image: ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}
330
-          extra-images: |
329
+          tags: ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}
330
+          inputs: |
331
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-amd64,
331
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-amd64,
332
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-arm64v8,
332
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-arm64v8,
333
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-armv7,
333
             ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-armv7,