chore: build fix

This commit is contained in:
lejianwen committed 2025-08-10 22:31:24 +08:00
1 parent 813e78d686
commit 4ff3d2db9a
2 files changed
+19 -19

No files matched your search

+13 -13
View File
@@ -26,7 +26,7 @@ jobs:
build: build:
name: Build - ${{ matrix.job.name }} name: Build - ${{ matrix.job.name }}
runs-on: ubuntu-20.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -172,7 +172,7 @@ jobs:
needs: needs:
- build - build
- build-win - build-win
runs-on: ubuntu-20.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -212,7 +212,7 @@ jobs:
name: Docker push - ${{ matrix.job.name }} name: Docker push - ${{ matrix.job.name }}
needs: build needs: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -285,7 +285,7 @@ jobs:
name: Docker manifest s6 name: Docker manifest s6
needs: docker needs: docker
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
@@ -348,7 +348,7 @@ jobs:
name: Docker push classic - ${{ matrix.job.name }} name: Docker push classic - ${{ matrix.job.name }}
needs: build needs: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -418,7 +418,7 @@ jobs:
name: Docker manifest classic name: Docker manifest classic
needs: docker needs: docker
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
- name: Log in to Docker Hub - name: Log in to Docker Hub
@@ -442,24 +442,24 @@ jobs:
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
if: github.event_name != 'workflow_dispatch' if: github.event_name != 'workflow_dispatch'
with: with:
base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }} tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.GIT_TAG }}
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 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
push: true push: true
# manifest for :1 tag (major release) # manifest for :1 tag (major release)
- name: Create and push manifest (:major) - name: Create and push manifest (:major)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }} tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.MAJOR_TAG }}
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 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
push: true push: true
# manifest for :latest tag # manifest for :latest tag
- name: Create and push manifest (:latest) - name: Create and push manifest (:latest)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }} tags: ${{ secrets.DOCKER_IMAGE_CLASSIC }}:${{ env.LATEST_TAG }}
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 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
push: true push: true
@@ -467,7 +467,7 @@ jobs:
name: debian package - ${{ matrix.job.name }} name: debian package - ${{ matrix.job.name }}
needs: build needs: build
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
+6 -6
View File
@@ -302,8 +302,8 @@ jobs:
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
if: github.event_name != 'workflow_dispatch' if: github.event_name != 'workflow_dispatch'
with: with:
base-image: ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }} tags: ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}
extra-images: | inputs: |
ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-amd64, ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-amd64,
ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-arm64v8, ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-arm64v8,
ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-armv7, ghcr.io/${{ github.repository }}:${{ env.GIT_TAG }}-armv7,
@@ -314,8 +314,8 @@ jobs:
- name: Create and push manifest (:major) - name: Create and push manifest (:major)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }} tags: ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}
extra-images: | inputs: |
ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-amd64, ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-amd64,
ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-arm64v8, ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-arm64v8,
ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-armv7, ghcr.io/${{ github.repository }}:${{ env.MAJOR_TAG }}-armv7,
@@ -326,8 +326,8 @@ jobs:
- name: Create and push manifest (:latest) - name: Create and push manifest (:latest)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }} tags: ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}
extra-images: | inputs: |
ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-amd64, ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-amd64,
ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-arm64v8, ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-arm64v8,
ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-armv7, ghcr.io/${{ github.repository }}:${{ env.LATEST_TAG }}-armv7,