Merge pull request #204 from Suwayomi/main

test
Suwayomi · Jun 21, 2024 · f10934e · f10934e
2 parents c69a5c0 + f693cb4
commit f10934e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 40 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,10 @@
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
 
 name: Build
+
+env:
+  THEMES: "['', 'wintry', 'skeleton', 'crimson', 'gold-nouveau', 'hamlindigo', 'modern', 'rocket', 'sahara', 'seafoam', 'vintage']"
+
 on:
   push:
     branches: ['Release']
@@ -53,6 +57,7 @@ jobs:
           path: |
             ./build/
             ./buildZip/md5sum
+          retention-days: 1
   web:
     needs:
       - build
@@ -81,18 +86,7 @@ jobs:
   dockerBuilds:
     strategy:
       matrix:
-        theme:
-          - ''
-          - 'wintry'
-          - 'skeleton'
-          - 'crimson'
-          - 'gold-nouveau'
-          - 'hamlindigo'
-          - 'modern'
-          - 'rocket'
-          - 'sahara'
-          - 'seafoam'
-          - 'vintage'
+        theme: ${{ fromJSON(github.env.THEMES) }}
     needs:
       - build
       - GenTag
@@ -125,45 +119,25 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - id: string
-        uses: ASzc/change-string-case-action@v6
-        with:
-          string: ${{ github.repository_owner }}/${{ github.event.repository.name }}
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64, linux/386, linux/ppc64le, linux/s390x
           context: .
           build-args: version=${{ needs.GenTag.outputs.value }}
           push: false
-          outputs: type=docker,dest=/tmp/myimage.tar
+          outputs: type=docker,dest=/tmp/${{ matrix.theme }}.tar
           tags: |
-            ghcr.io/${{ steps.string.outputs.lowercase }}:latest${{ matrix.theme }},
-            ghcr.io/${{ steps.string.outputs.lowercase }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }},
-            ${{ steps.string.outputs.lowercase }}:latest${{ matrix.theme }},
-            ${{ steps.string.outputs.lowercase }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }},
+            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest${{ matrix.theme }},
+            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }},
+            ${{ github.repository_owner }}/${{ github.event.repository.name }}:latest${{ matrix.theme }},
+            ${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }},
       - uses: actions/upload-artifact@v4
         with:
           name: build-files-${{ needs.GenTag.outputs.value }}-${{ matrix.theme }}
           path: |
-            /tmp/myimage.tar
-
+            /tmp/${{ matrix.theme }}.tar
   docker:
-    strategy:
-      max-parallel: 1
-      matrix:
-        theme:
-          - ''
-          - 'wintry'
-          - 'skeleton'
-          - 'crimson'
-          - 'gold-nouveau'
-          - 'hamlindigo'
-          - 'modern'
-          - 'rocket'
-          - 'sahara'
-          - 'seafoam'
-          - 'vintage'
     needs:
       - build
       - GenTag
@@ -173,8 +147,9 @@ jobs:
       - name: get Build files
         uses: actions/download-artifact@v4
         with:
-          name: build-files-${{ needs.GenTag.outputs.value }}-${{ matrix.theme }}
+          name: build-files-${{ needs.GenTag.outputs.value }}-*
           path: ./
+          merge-multiple: true
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -188,6 +163,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Load ad push image
         run: |
-          docker load --input /myimage.tar
+          for f in *.tar; do
+              cat $f | docker load
+          done
           docker push -a ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
           docker push -a ${{ github.repository_owner }}/${{ github.event.repository.name }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -14,6 +14,8 @@ on:
     branches: ['main', 'Release']
     paths-ignore:
       - '**/README.md'
+      - '.github/workflows/**.yml'
+      - '**/default.conf'
 
 jobs:
   run-check:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,6 +14,8 @@ on:
     branches: ['main', 'Release']
     paths-ignore:
       - '**/README.md'
+      - '.github/workflows/**.yml'
+      - '**/default.conf'
 
 jobs:
   run-linters: