From f48ab0c2c0924a9a7e81c045af60bf3559a120a1 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:04:29 +0100 Subject: [PATCH 01/54] fix json --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a784eb9c..b8d66bbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ name: Build env: - THEMES: "['', 'wintry', 'skeleton', 'crimson', 'gold-nouveau', 'hamlindigo', 'modern', 'rocket', 'sahara', 'seafoam', 'vintage']" + THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' on: push: From e1c1b99c39be86c136874a715201b6165b019319 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:05:10 +0100 Subject: [PATCH 02/54] workflow_dispatch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8d66bbe..453e108f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ env: THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' on: + workflow_dispatch: push: branches: ['Release'] paths-ignore: From 65ef59eee80d8cea0d31b4931a28747a390b3d98 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:10:15 +0100 Subject: [PATCH 03/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 453e108f..c44f7b4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: dockerBuilds: strategy: matrix: - theme: ${{ fromJSON(github.env.THEMES) }} + theme: ${{ fromJSON( env.themes ) }} needs: - build - GenTag From 672ffd89b63e9e00e2f404892b5bf2b095d56efc Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:11:00 +0100 Subject: [PATCH 04/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c44f7b4f..ef894624 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: dockerBuilds: strategy: matrix: - theme: ${{ fromJSON( env.themes ) }} + theme: ${{ fromJSON( env.THEMES ) }} needs: - build - GenTag From 72a5c6a06c7b631b62da665012961fc71280cbc2 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:12:14 +0100 Subject: [PATCH 05/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef894624..951a1f65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: dockerBuilds: strategy: matrix: - theme: ${{ fromJSON( env.THEMES ) }} + theme: ${{ fromJSON( vars.THEMES ) }} needs: - build - GenTag From 8acfd39a5fa6424409950a6523a4d78eb6316de1 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:14:36 +0100 Subject: [PATCH 06/54] test --- .github/workflows/test.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..57a28fc8 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,13 @@ +name: test + +env: + THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + +on: + workflow_dispatch: + +jobs: + test: + runs-on: ubuntu-latest + steps: + - run: echo '${{ vars.THEMES }}' From 34ca5f0b538d3042a6177034f09298133a18068b Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:15:12 +0100 Subject: [PATCH 07/54] test --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 57a28fc8..432f8aff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,8 @@ env: on: workflow_dispatch: + push: + branches: ['main'] jobs: test: From 5375bb9e0905d550947d70b22ade55328ead4e0d Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:16:08 +0100 Subject: [PATCH 08/54] test --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 432f8aff..8077fe16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,4 +12,4 @@ jobs: test: runs-on: ubuntu-latest steps: - - run: echo '${{ vars.THEMES }}' + - run: echo '${{ github.env.THEMES }}' From 203032c8f5213d5ef4556a290890856d069e331b Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:20:35 +0100 Subject: [PATCH 09/54] test --- .github/workflows/build.yml | 7 ++++++- .github/workflows/test.yml | 15 --------------- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 951a1f65..b677e60b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,10 @@ defaults: run: shell: bash jobs: + ComputeThemes: + runs-on: ubuntu-latest + outputs: + value: ${{ env.THEMES }} GenTag: outputs: value: ${{steps.GenTagName.outputs.value}} @@ -87,10 +91,11 @@ jobs: dockerBuilds: strategy: matrix: - theme: ${{ fromJSON( vars.THEMES ) }} + theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} needs: - build - GenTag + - ComputeThemes runs-on: ubuntu-latest steps: - name: get Build files diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 8077fe16..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: test - -env: - THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' - -on: - workflow_dispatch: - push: - branches: ['main'] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - run: echo '${{ github.env.THEMES }}' From 8faeb0a1cbfbbfc4d5bd94208b5bb7a4949b2941 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:22:10 +0100 Subject: [PATCH 10/54] test --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b677e60b..cd714843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,10 @@ jobs: runs-on: ubuntu-latest outputs: value: ${{ env.THEMES }} + steps: + - name: Compute Themes + run: | + echo "value=$THEMES" >> $GITHUB_OUTPUT GenTag: outputs: value: ${{steps.GenTagName.outputs.value}} From ce3097c640d8db496a570a3e3bcbc153e7c9142e Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:25:34 +0100 Subject: [PATCH 11/54] woops --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd714843..98efd3cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,11 +120,6 @@ jobs: with: sparse-checkout: | Dockerfile - - name: get Build files - uses: actions/download-artifact@v4 - with: - name: build-files-${{ needs.GenTag.outputs.value }}-${{ matrix.theme }} - path: ./ - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From e96b66f0834ff9218f7333c618c0cb7eb1fd7247 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:32:20 +0100 Subject: [PATCH 12/54] test --- .github/workflows/build.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98efd3cc..2e649843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,18 @@ defaults: run: shell: bash jobs: + RepoName: + runs-on: ubuntu-latest + outputs: + value: ${{ steps.RepoName.outputs.lowercase }} + steps: + - name: Get Repo Name + id: RepoName + uses: ASzc/change-string-case-action@v6 + with: + string: ${{ github.repository_owner }}/${{ github.event.repository.name }} + - name: Set Repo Name + run: echo "REPO_NAME=${{ steps.RepoName.outputs.lowercase }}" >> $GITHUB_OUTPUT ComputeThemes: runs-on: ubuntu-latest outputs: @@ -100,6 +112,7 @@ jobs: - build - GenTag - ComputeThemes + - RepoName runs-on: ubuntu-latest steps: - name: get Build files @@ -133,10 +146,10 @@ jobs: push: false outputs: type=docker,dest=/tmp/${{ matrix.theme }}.tar tags: | - 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 }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - uses: actions/upload-artifact@v4 with: name: build-files-${{ needs.GenTag.outputs.value }}-${{ matrix.theme }} @@ -147,6 +160,7 @@ jobs: - build - GenTag - dockerBuilds + - RepoName runs-on: ubuntu-latest steps: - name: get Build files @@ -166,10 +180,10 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Load ad push image + - name: Load and push image run: | 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 }} + docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} + docker push -a ${{ needs.RepoName.outputs.value }} From 2022fe69841ec30f90fe59cf5d366e38adf3dbef Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:36:17 +0100 Subject: [PATCH 13/54] test --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e649843..b47f2d35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,14 +137,14 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push Docker image + - name: Build 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/${{ matrix.theme }}.tar + outputs: type=oci,dest=/tmp/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, From 9fe4b131c1638c621186cd3249555a2158e7dba4 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:36:39 +0100 Subject: [PATCH 14/54] test --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b47f2d35..d83929b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,6 @@ jobs: path: | ./build/ ./buildZip/md5sum - retention-days: 1 web: needs: - build From 4ddf3e66939fe9a5a04e25049ca38357f0994b3d Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:39:25 +0100 Subject: [PATCH 15/54] test --- .github/workflows/build.yml | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d83929b4..b47f2d35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,7 @@ jobs: path: | ./build/ ./buildZip/md5sum + retention-days: 1 web: needs: - build diff --git a/Dockerfile b/Dockerfile index b4989120..63ffe7f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/nginxinc/nginx-unprivileged:1.25.3-alpine-slim as production-stage +FROM ghcr.io/nginxinc/nginx-unprivileged:1.25.3-alpine-slim USER root COPY ./build /usr/share/nginx/html COPY ./default.conf /etc/nginx/conf.d/default.conf From 80e86aae89c29db9f7901da9183a06aa3504e368 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:42:31 +0100 Subject: [PATCH 16/54] test --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b47f2d35..005077b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,6 +120,8 @@ jobs: with: name: build-files-${{ needs.GenTag.outputs.value }} path: ./ + - name: log ls + run: ls - name: Replace theme in the HTML files to generate differant theme builds if: ${{ matrix.theme != '' }} uses: richardrigutins/replace-in-files@v2 From 05f22c45ce0dd1d8ea8fc9b177f7b00853cc4cec Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:47:38 +0100 Subject: [PATCH 17/54] lots o logs --- .github/workflows/build.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 005077b0..5f594e01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: - run: bun run build-md5 - uses: actions/upload-artifact@v4 with: - name: build-files-${{ needs.GenTag.outputs.value }} + name: build-files path: | ./build/ ./buildZip/md5sum @@ -88,7 +88,7 @@ jobs: - name: get Build files uses: actions/download-artifact@v4 with: - name: build-files-${{ needs.GenTag.outputs.value }} + name: build-files path: ./ - name: Generate zip working-directory: ./build @@ -118,7 +118,7 @@ jobs: - name: get Build files uses: actions/download-artifact@v4 with: - name: build-files-${{ needs.GenTag.outputs.value }} + name: build-files path: ./ - name: log ls run: ls @@ -130,16 +130,24 @@ jobs: search-text: data-theme='skeleton' replacement-text: data-theme='${{ matrix.theme }}' encoding: utf8 + - name: log ls + run: ls - name: Check out Dockerfile uses: actions/checkout@v4 with: sparse-checkout: | Dockerfile + - name: log ls + run: ls - name: Set up QEMU uses: docker/setup-qemu-action@v3 + - name: log ls + run: ls - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build Docker image + - name: log ls + run: ls + - name: Build 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 @@ -154,7 +162,7 @@ jobs: ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - uses: actions/upload-artifact@v4 with: - name: build-files-${{ needs.GenTag.outputs.value }}-${{ matrix.theme }} + name: build-files-${{ matrix.theme }} path: | /tmp/${{ matrix.theme }}.tar docker: @@ -168,7 +176,7 @@ jobs: - name: get Build files uses: actions/download-artifact@v4 with: - name: build-files-${{ needs.GenTag.outputs.value }}-* + name: build-files-* path: ./ merge-multiple: true - name: Login to Docker Hub From c79797e4a89a7c2a1eb70c84f72eb26f24f3931f Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:50:24 +0100 Subject: [PATCH 18/54] ordering --- .github/workflows/build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f594e01..b5d1a2af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,6 +115,11 @@ jobs: - RepoName runs-on: ubuntu-latest steps: + - name: Check out Dockerfile + uses: actions/checkout@v4 + with: + sparse-checkout: | + Dockerfile - name: get Build files uses: actions/download-artifact@v4 with: @@ -132,13 +137,6 @@ jobs: encoding: utf8 - name: log ls run: ls - - name: Check out Dockerfile - uses: actions/checkout@v4 - with: - sparse-checkout: | - Dockerfile - - name: log ls - run: ls - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: log ls From 01533d0f046fd0f5de3c5525222a5546a0a0d11f Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:51:18 +0100 Subject: [PATCH 19/54] fix --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5d1a2af..a6035bc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,8 +118,7 @@ jobs: - name: Check out Dockerfile uses: actions/checkout@v4 with: - sparse-checkout: | - Dockerfile + sparse-checkout: Dockerfile - name: get Build files uses: actions/download-artifact@v4 with: From d03c9216addfdf01605a0db81ef4e3397efea850 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:54:14 +0100 Subject: [PATCH 20/54] pattern not name --- .github/workflows/build.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6035bc6..6a839a4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,8 +124,6 @@ jobs: with: name: build-files path: ./ - - name: log ls - run: ls - name: Replace theme in the HTML files to generate differant theme builds if: ${{ matrix.theme != '' }} uses: richardrigutins/replace-in-files@v2 @@ -134,16 +132,10 @@ jobs: search-text: data-theme='skeleton' replacement-text: data-theme='${{ matrix.theme }}' encoding: utf8 - - name: log ls - run: ls - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - name: log ls - run: ls - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: log ls - run: ls - name: Build Docker image uses: docker/build-push-action@v5 with: @@ -173,7 +165,7 @@ jobs: - name: get Build files uses: actions/download-artifact@v4 with: - name: build-files-* + pattern: build-files-* path: ./ merge-multiple: true - name: Login to Docker Hub From ddf0e50a535006e59db4ee9133feb60ab764a50b Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 14:59:06 +0100 Subject: [PATCH 21/54] ls again --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a839a4a..925583a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -179,6 +179,8 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: ls data + run: ls - name: Load and push image run: | for f in *.tar; do From 4c334afc713d1c61e65ac86e823d78ae1fb992d6 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:01:41 +0100 Subject: [PATCH 22/54] needs a -i --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 925583a5..f6227224 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,7 +184,7 @@ jobs: - name: Load and push image run: | for f in *.tar; do - cat $f | docker load + cat $f | docker load -i done docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} docker push -a ${{ needs.RepoName.outputs.value }} From cede69fbe6d4a2f0a75d3b08028a9053919fb236 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:10:22 +0100 Subject: [PATCH 23/54] test --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6227224..812e3395 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -183,8 +183,6 @@ jobs: run: ls - name: Load and push image run: | - for f in *.tar; do - cat $f | docker load -i - done + ls -1 *.tar | xargs --no-run-if-empty -L 1 docker load -i docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} docker push -a ${{ needs.RepoName.outputs.value }} From d65752e096c37ebb096ad47974706c22334183bb Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:11:15 +0100 Subject: [PATCH 24/54] test --- .github/workflows/build.yml | 191 ++++++++++++++++++------------------ 1 file changed, 95 insertions(+), 96 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 812e3395..2420162f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,109 +56,108 @@ jobs: genTag="r$(git rev-list HEAD --count)" echo "$genTag" echo "value=$genTag" >> $GITHUB_OUTPUT - build: - needs: GenTag - runs-on: ubuntu-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - name: Use bun 1.1.0 - uses: oven-sh/setup-bun@v1 - with: - bun-version: latest - - name: Install bun dependencies - run: bun i - - run: bun run build - - run: echo "${{ needs.GenTag.outputs.value }}" > ./build/revision - - run: sed -i "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" ./build/index.html - - run: bun run build-md5 - - uses: actions/upload-artifact@v4 - with: - name: build-files - path: | - ./build/ - ./buildZip/md5sum - retention-days: 1 - web: - needs: - - build - - GenTag - runs-on: ubuntu-latest - steps: - - name: get Build files - uses: actions/download-artifact@v4 - with: - name: build-files - path: ./ - - name: Generate zip - working-directory: ./build - run: zip -r Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip ./* - - name: Release - uses: softprops/action-gh-release@v1 - with: - files: | - ./build/Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip - ./buildZip/md5sum - name: ${{ needs.GenTag.outputs.value }} - tag_name: ${{ needs.GenTag.outputs.value }} - body: '' - draft: false - prerelease: false - dockerBuilds: - strategy: - matrix: - theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} - needs: - - build - - GenTag - - ComputeThemes - - RepoName - runs-on: ubuntu-latest - steps: - - name: Check out Dockerfile - uses: actions/checkout@v4 - with: - sparse-checkout: Dockerfile - - name: get Build files - uses: actions/download-artifact@v4 - with: - name: build-files - path: ./ - - name: Replace theme in the HTML files to generate differant theme builds - if: ${{ matrix.theme != '' }} - uses: richardrigutins/replace-in-files@v2 - with: - files: '**/*.html' - search-text: data-theme='skeleton' - replacement-text: data-theme='${{ matrix.theme }}' - encoding: utf8 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Build 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=oci,dest=/tmp/${{ matrix.theme }}.tar - tags: | - ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - - uses: actions/upload-artifact@v4 + # build: + # needs: GenTag + # runs-on: ubuntu-latest + # steps: + # - name: Check out Git repository + # uses: actions/checkout@v4 + # - name: Use bun 1.1.0 + # uses: oven-sh/setup-bun@v1 + # with: + # bun-version: latest + # - name: Install bun dependencies + # run: bun i + # - run: bun run build + # - run: echo "${{ needs.GenTag.outputs.value }}" > ./build/revision + # - run: sed -i "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" ./build/index.html + # - run: bun run build-md5 + # - uses: actions/upload-artifact@v4 + # with: + # name: build-files + # path: | + # ./build/ + # ./buildZip/md5sum + # retention-days: 1 + # web: + # needs: + # - build + # - GenTag + # runs-on: ubuntu-latest + # steps: + # - name: get Build files + # uses: actions/download-artifact@v4 + # with: + # name: build-files + # path: ./ + # - name: Generate zip + # working-directory: ./build + # run: zip -r Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip ./* + # - name: Release + # uses: softprops/action-gh-release@v1 + # with: + # files: | + # ./build/Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip + # ./buildZip/md5sum + # name: ${{ needs.GenTag.outputs.value }} + # tag_name: ${{ needs.GenTag.outputs.value }} + # body: '' + # draft: false + # prerelease: false + # dockerBuilds: + # strategy: + # matrix: + # theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} + # needs: + # - build + # - GenTag + # - ComputeThemes + # - RepoName + # runs-on: ubuntu-latest + # steps: + # - name: Check out Dockerfile + # uses: actions/checkout@v4 + # with: + # sparse-checkout: Dockerfile + # - name: get Build files + # uses: actions/download-artifact@v4 + # with: + # name: build-files + # path: ./ + # - name: Replace theme in the HTML files to generate differant theme builds + # if: ${{ matrix.theme != '' }} + # uses: richardrigutins/replace-in-files@v2 + # with: + # files: '**/*.html' + # search-text: data-theme='skeleton' + # replacement-text: data-theme='${{ matrix.theme }}' + # encoding: utf8 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 + # - name: Build 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=oci,dest=/tmp/${{ matrix.theme }}.tar + # tags: | + # ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + # ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + # ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + # ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + # - uses: actions/upload-artifact@v4 with: name: build-files-${{ matrix.theme }} path: | /tmp/${{ matrix.theme }}.tar docker: needs: - - build - GenTag - - dockerBuilds + # - dockerBuilds - RepoName runs-on: ubuntu-latest steps: From b2394c9aa174f9ad4d67ea4a6bc8b6f6b7900e90 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:12:00 +0100 Subject: [PATCH 25/54] test --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2420162f..9e8e03b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,10 +150,10 @@ jobs: # ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, # ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, # - uses: actions/upload-artifact@v4 - with: - name: build-files-${{ matrix.theme }} - path: | - /tmp/${{ matrix.theme }}.tar + # with: + # name: build-files-${{ matrix.theme }} + # path: | + # /tmp/${{ matrix.theme }}.tar docker: needs: - GenTag From 3f117c8a62e66eca8151a2972aa6451a1f153c6e Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:13:25 +0100 Subject: [PATCH 26/54] test --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e8e03b6..96f79d0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,6 +178,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - run: touch test.tar - name: ls data run: ls - name: Load and push image From 0f1e1f0ef31363b5ea801ec4aab5ac9a96854e50 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:15:05 +0100 Subject: [PATCH 27/54] test --- .github/workflows/build.yml | 199 ++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 100 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96f79d0e..c77aa4d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,108 +56,108 @@ jobs: genTag="r$(git rev-list HEAD --count)" echo "$genTag" echo "value=$genTag" >> $GITHUB_OUTPUT - # build: - # needs: GenTag - # runs-on: ubuntu-latest - # steps: - # - name: Check out Git repository - # uses: actions/checkout@v4 - # - name: Use bun 1.1.0 - # uses: oven-sh/setup-bun@v1 - # with: - # bun-version: latest - # - name: Install bun dependencies - # run: bun i - # - run: bun run build - # - run: echo "${{ needs.GenTag.outputs.value }}" > ./build/revision - # - run: sed -i "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" ./build/index.html - # - run: bun run build-md5 - # - uses: actions/upload-artifact@v4 - # with: - # name: build-files - # path: | - # ./build/ - # ./buildZip/md5sum - # retention-days: 1 - # web: - # needs: - # - build - # - GenTag - # runs-on: ubuntu-latest - # steps: - # - name: get Build files - # uses: actions/download-artifact@v4 - # with: - # name: build-files - # path: ./ - # - name: Generate zip - # working-directory: ./build - # run: zip -r Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip ./* - # - name: Release - # uses: softprops/action-gh-release@v1 - # with: - # files: | - # ./build/Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip - # ./buildZip/md5sum - # name: ${{ needs.GenTag.outputs.value }} - # tag_name: ${{ needs.GenTag.outputs.value }} - # body: '' - # draft: false - # prerelease: false - # dockerBuilds: - # strategy: - # matrix: - # theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} - # needs: - # - build - # - GenTag - # - ComputeThemes - # - RepoName - # runs-on: ubuntu-latest - # steps: - # - name: Check out Dockerfile - # uses: actions/checkout@v4 - # with: - # sparse-checkout: Dockerfile - # - name: get Build files - # uses: actions/download-artifact@v4 - # with: - # name: build-files - # path: ./ - # - name: Replace theme in the HTML files to generate differant theme builds - # if: ${{ matrix.theme != '' }} - # uses: richardrigutins/replace-in-files@v2 - # with: - # files: '**/*.html' - # search-text: data-theme='skeleton' - # replacement-text: data-theme='${{ matrix.theme }}' - # encoding: utf8 - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - # - name: Build 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=oci,dest=/tmp/${{ matrix.theme }}.tar - # tags: | - # ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - # ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - # ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - # ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - # - uses: actions/upload-artifact@v4 - # with: - # name: build-files-${{ matrix.theme }} - # path: | - # /tmp/${{ matrix.theme }}.tar + build: + needs: GenTag + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Use bun 1.1.0 + uses: oven-sh/setup-bun@v1 + with: + bun-version: latest + - name: Install bun dependencies + run: bun i + - run: bun run build + - run: echo "${{ needs.GenTag.outputs.value }}" > ./build/revision + - run: sed -i "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" ./build/index.html + - run: bun run build-md5 + - uses: actions/upload-artifact@v4 + with: + name: build-files + path: | + ./build/ + ./buildZip/md5sum + retention-days: 1 + web: + needs: + - build + - GenTag + runs-on: ubuntu-latest + steps: + - name: get Build files + uses: actions/download-artifact@v4 + with: + name: build-files + path: ./ + - name: Generate zip + working-directory: ./build + run: zip -r Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip ./* + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + ./build/Suwayomi-VUI-Web-${{ needs.GenTag.outputs.value }}.zip + ./buildZip/md5sum + name: ${{ needs.GenTag.outputs.value }} + tag_name: ${{ needs.GenTag.outputs.value }} + body: '' + draft: false + prerelease: false + dockerBuilds: + strategy: + matrix: + theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} + needs: + - build + - GenTag + - ComputeThemes + - RepoName + runs-on: ubuntu-latest + steps: + - name: Check out Dockerfile + uses: actions/checkout@v4 + with: + sparse-checkout: Dockerfile + - name: get Build files + uses: actions/download-artifact@v4 + with: + name: build-files + path: ./ + - name: Replace theme in the HTML files to generate differant theme builds + if: ${{ matrix.theme != '' }} + uses: richardrigutins/replace-in-files@v2 + with: + files: '**/*.html' + search-text: data-theme='skeleton' + replacement-text: data-theme='${{ matrix.theme }}' + encoding: utf8 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build 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=oci,dest=/tmp/${{ matrix.theme }}.tar + tags: | + ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + - uses: actions/upload-artifact@v4 + with: + name: build-files-${{ matrix.theme }} + path: | + /tmp/${{ matrix.theme }}.tar docker: needs: - GenTag - # - dockerBuilds + - dockerBuilds - RepoName runs-on: ubuntu-latest steps: @@ -178,7 +178,6 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - run: touch test.tar - name: ls data run: ls - name: Load and push image From 27f7a5951abd0c7b1567ff35bad358b0e0647e46 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:16:22 +0100 Subject: [PATCH 28/54] test --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c77aa4d4..baf5712d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,8 @@ name: Build env: - THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + # THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + THEMES: '["wintry"]' on: workflow_dispatch: From e969f770e2dcc6393df9d9805644d3c6e7b440fd Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:25:40 +0100 Subject: [PATCH 29/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baf5712d..da064db0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: context: . build-args: version=${{ needs.GenTag.outputs.value }} push: false - outputs: type=oci,dest=/tmp/${{ matrix.theme }}.tar + outputs: type=docker,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, From 3aff51e996b7f4aa84efd4aa843f5da16982f81e Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:27:23 +0100 Subject: [PATCH 30/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da064db0..b2ce4da0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: context: . build-args: version=${{ needs.GenTag.outputs.value }} push: false - outputs: type=docker,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar + outputs: type=image,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, From a1f23c00375cb1e4f7c5fd86f6a909f4b62cc199 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:31:41 +0100 Subject: [PATCH 31/54] test --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2ce4da0..113d3ecc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,6 +150,10 @@ jobs: ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + - name: ls tmp + run: | + cd /tmp + ls - uses: actions/upload-artifact@v4 with: name: build-files-${{ matrix.theme }} From 12c9fe65fd1711bfc1473df81867c6db9038101f Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:33:29 +0100 Subject: [PATCH 32/54] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 113d3ecc..d1f46c5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: context: . build-args: version=${{ needs.GenTag.outputs.value }} push: false - outputs: type=image,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar + outputs: type=oci,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, From aa60569bbe20c7a551d6622323ef04039dc605b0 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:37:58 +0100 Subject: [PATCH 33/54] test --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1f46c5c..a6be2151 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,21 +144,21 @@ jobs: context: . build-args: version=${{ needs.GenTag.outputs.value }} push: false - outputs: type=oci,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar + outputs: type=oci,oci-mediatypes=true,dest=/outs/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - - name: ls tmp + - name: ls outs run: | - cd /tmp + cd /outs ls - uses: actions/upload-artifact@v4 with: name: build-files-${{ matrix.theme }} path: | - /tmp/${{ matrix.theme }}.tar + /outs/${{ matrix.theme }}.tar docker: needs: - GenTag @@ -187,6 +187,8 @@ jobs: run: ls - name: Load and push image run: | - ls -1 *.tar | xargs --no-run-if-empty -L 1 docker load -i + for i in *.tar; do + docker load -i $i + done docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} docker push -a ${{ needs.RepoName.outputs.value }} From b6fd673c5f280a8938bf56c0f92212e32a0518c1 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:39:53 +0100 Subject: [PATCH 34/54] woops --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6be2151..5017066b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,21 +144,21 @@ jobs: context: . build-args: version=${{ needs.GenTag.outputs.value }} push: false - outputs: type=oci,oci-mediatypes=true,dest=/outs/${{ matrix.theme }}.tar + outputs: type=oci,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar tags: | ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - - name: ls outs + - name: ls tmp run: | - cd /outs + cd /tmp ls - uses: actions/upload-artifact@v4 with: name: build-files-${{ matrix.theme }} path: | - /outs/${{ matrix.theme }}.tar + /tmp/${{ matrix.theme }}.tar docker: needs: - GenTag From 642217b79dfffa7f30e73f9db3f12532018e7336 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:43:18 +0100 Subject: [PATCH 35/54] test --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5017066b..754b1b2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -186,9 +186,10 @@ jobs: - name: ls data run: ls - name: Load and push image + # for i in *.tar; do + # docker load -i $i + # done run: | - for i in *.tar; do - docker load -i $i - done + docker load -i ./wintry.tar docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} docker push -a ${{ needs.RepoName.outputs.value }} From 804ffa61094ae6f1e47fd6ce75a7ba5ce89bf5bb Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 15:59:02 +0100 Subject: [PATCH 36/54] test --- .github/workflows/build.yml | 60 +++++++++---------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 754b1b2e..9a229d4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,8 +105,9 @@ jobs: body: '' draft: false prerelease: false - dockerBuilds: + docker: strategy: + max-parallel: 1 matrix: theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} needs: @@ -137,41 +138,6 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build 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=oci,oci-mediatypes=true,dest=/tmp/${{ matrix.theme }}.tar - tags: | - ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - - name: ls tmp - run: | - cd /tmp - ls - - uses: actions/upload-artifact@v4 - with: - name: build-files-${{ matrix.theme }} - path: | - /tmp/${{ matrix.theme }}.tar - docker: - needs: - - GenTag - - dockerBuilds - - RepoName - runs-on: ubuntu-latest - steps: - - name: get Build files - uses: actions/download-artifact@v4 - with: - pattern: build-files-* - path: ./ - merge-multiple: true - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -183,13 +149,15 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: ls data - run: ls - - name: Load and push image - # for i in *.tar; do - # docker load -i $i - # done - run: | - docker load -i ./wintry.tar - docker push -a ghcr.io/${{ needs.RepoName.outputs.value }} - docker push -a ${{ needs.RepoName.outputs.value }} + - name: Build 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: true + tags: | + ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, + ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, From f1a082beefd6873ca944dbb40c623210c0a18fac Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:05:08 +0100 Subject: [PATCH 37/54] test --- .github/workflows/build.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a229d4f..99946e0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,8 @@ name: Build env: - # THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' - THEMES: '["wintry"]' + THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + # THEMES: '["wintry"]' on: workflow_dispatch: @@ -107,7 +107,7 @@ jobs: prerelease: false docker: strategy: - max-parallel: 1 + # max-parallel: 1 matrix: theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} needs: @@ -149,6 +149,18 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Initialize matrix lock + if: ${{ matrix.theme != fromJson(env.THEMES)[0] }} + uses: rakles/matrix-lock@v1.0.0 + with: + step: init + order: ${{ join(fromJson(env.THEMES), ',') }} + + - name: Wait for matrix lock + uses: rakles/matrix-lock@v1.0.0 + with: + step: wait + id: ${{ matrix.theme }} - name: Build Docker image uses: docker/build-push-action@v5 with: @@ -161,3 +173,8 @@ jobs: ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + - name: Continue matrix lock + uses: rakles/matrix-lock@v1.0.0 + with: + step: continue + id: ${{ matrix.theme }} From 52a9f247a76feca0da38f48b33f74f78ba89bba4 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:12:35 +0100 Subject: [PATCH 38/54] test --- .github/workflows/build.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99946e0f..41a45cec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ name: Build env: - THEMES: '["wintry", "","skeleton", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + THEMES: '["Default", "skeleton", "wintry", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' # THEMES: '["wintry"]' on: @@ -161,6 +161,15 @@ jobs: with: step: wait id: ${{ matrix.theme }} + - name: theme + id: theme + run: | + if [[ ${{ matrix.theme }} != 'Default' ]]; then + echo "value=" >> $GITHUB_OUTPUT + else + echo "value=${{ matrix.theme }}" >> $GITHUB_OUTPUT + fi + - name: Build Docker image uses: docker/build-push-action@v5 with: @@ -169,10 +178,10 @@ jobs: build-args: version=${{ needs.GenTag.outputs.value }} push: true tags: | - ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:latest${{ matrix.theme }}, - ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ matrix.theme }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ steps.theme.outputs.value }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, + ${{ needs.RepoName.outputs.value }}:latest${{ steps.theme.outputs.value }}, + ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, - name: Continue matrix lock uses: rakles/matrix-lock@v1.0.0 with: From 57329c009d800d814993cdce367d486aa943894f Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:14:41 +0100 Subject: [PATCH 39/54] woops --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41a45cec..26f4f225 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,7 +150,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Initialize matrix lock - if: ${{ matrix.theme != fromJson(env.THEMES)[0] }} + if: ${{ matrix.theme == fromJson(env.THEMES)[0] }} uses: rakles/matrix-lock@v1.0.0 with: step: init From 6ea317ed1a5ee648764bf8f19c5b9efc533ad57d Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:16:49 +0100 Subject: [PATCH 40/54] test --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26f4f225..c7922917 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,6 +121,13 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: Dockerfile + - name: Initialize matrix lock + if: ${{ matrix.theme == fromJson(env.THEMES)[0] }} + uses: rakles/matrix-lock@v1.0.0 + with: + step: init + order: ${{ join(fromJson(env.THEMES), ',') }} + - name: get Build files uses: actions/download-artifact@v4 with: @@ -149,13 +156,6 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Initialize matrix lock - if: ${{ matrix.theme == fromJson(env.THEMES)[0] }} - uses: rakles/matrix-lock@v1.0.0 - with: - step: init - order: ${{ join(fromJson(env.THEMES), ',') }} - - name: Wait for matrix lock uses: rakles/matrix-lock@v1.0.0 with: From 3a194c744f45c38344897521545fa4e19a93155e Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:23:10 +0100 Subject: [PATCH 41/54] slow but works? --- .github/workflows/build.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7922917..580713e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ name: Build env: - THEMES: '["Default", "skeleton", "wintry", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage"]' + THEMES: '["Default", "wintry", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage", "skeleton"]' # THEMES: '["wintry"]' on: @@ -107,7 +107,7 @@ jobs: prerelease: false docker: strategy: - # max-parallel: 1 + max-parallel: 1 matrix: theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} needs: @@ -121,13 +121,6 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: Dockerfile - - name: Initialize matrix lock - if: ${{ matrix.theme == fromJson(env.THEMES)[0] }} - uses: rakles/matrix-lock@v1.0.0 - with: - step: init - order: ${{ join(fromJson(env.THEMES), ',') }} - - name: get Build files uses: actions/download-artifact@v4 with: @@ -156,11 +149,6 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Wait for matrix lock - uses: rakles/matrix-lock@v1.0.0 - with: - step: wait - id: ${{ matrix.theme }} - name: theme id: theme run: | @@ -169,7 +157,6 @@ jobs: else echo "value=${{ matrix.theme }}" >> $GITHUB_OUTPUT fi - - name: Build Docker image uses: docker/build-push-action@v5 with: @@ -182,8 +169,3 @@ jobs: ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, ${{ needs.RepoName.outputs.value }}:latest${{ steps.theme.outputs.value }}, ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, - - name: Continue matrix lock - uses: rakles/matrix-lock@v1.0.0 - with: - step: continue - id: ${{ matrix.theme }} From 7d2fb0b6024b7cbcda84f0ad54c70260132573b0 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:26:21 +0100 Subject: [PATCH 42/54] woops --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 580713e3..bd2ac844 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,9 +153,9 @@ jobs: id: theme run: | if [[ ${{ matrix.theme }} != 'Default' ]]; then - echo "value=" >> $GITHUB_OUTPUT - else echo "value=${{ matrix.theme }}" >> $GITHUB_OUTPUT + else + echo "value=" >> $GITHUB_OUTPUT fi - name: Build Docker image uses: docker/build-push-action@v5 From f5dba2f780080b0840084e44f1ebd0057f645e9c Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:45:20 +0100 Subject: [PATCH 43/54] back to old action just make the docker image deal with the themeing ssr --- .github/workflows/build.yml | 34 ++++++---------------------------- docker-compose-example.yml | 5 +++++ set-env-variable.sh | 5 ++++- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd2ac844..e5ce08eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,19 +9,17 @@ name: Build -env: - THEMES: '["Default", "wintry", "crimson", "gold-nouveau", "hamlindigo", "modern", "rocket", "sahara", "seafoam", "vintage", "skeleton"]' - # THEMES: '["wintry"]' - on: workflow_dispatch: push: branches: ['Release'] paths-ignore: - '**/README.md' + defaults: run: shell: bash + jobs: RepoName: runs-on: ubuntu-latest @@ -106,10 +104,6 @@ jobs: draft: false prerelease: false docker: - strategy: - max-parallel: 1 - matrix: - theme: ${{ fromJSON(needs.ComputeThemes.outputs.value) }} needs: - build - GenTag @@ -126,14 +120,6 @@ jobs: with: name: build-files path: ./ - - name: Replace theme in the HTML files to generate differant theme builds - if: ${{ matrix.theme != '' }} - uses: richardrigutins/replace-in-files@v2 - with: - files: '**/*.html' - search-text: data-theme='skeleton' - replacement-text: data-theme='${{ matrix.theme }}' - encoding: utf8 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -149,14 +135,6 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: theme - id: theme - run: | - if [[ ${{ matrix.theme }} != 'Default' ]]; then - echo "value=${{ matrix.theme }}" >> $GITHUB_OUTPUT - else - echo "value=" >> $GITHUB_OUTPUT - fi - name: Build Docker image uses: docker/build-push-action@v5 with: @@ -165,7 +143,7 @@ jobs: build-args: version=${{ needs.GenTag.outputs.value }} push: true tags: | - ghcr.io/${{ needs.RepoName.outputs.value }}:latest${{ steps.theme.outputs.value }}, - ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, - ${{ needs.RepoName.outputs.value }}:latest${{ steps.theme.outputs.value }}, - ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}${{ steps.theme.outputs.value }}, + ghcr.io/${{ needs.RepoName.outputs.value }}:latest, + ghcr.io/${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}, + ${{ needs.RepoName.outputs.value }}:latest, + ${{ needs.RepoName.outputs.value }}:${{ needs.GenTag.outputs.value }}, diff --git a/docker-compose-example.yml b/docker-compose-example.yml index 2e56a1db..327a88d0 100644 --- a/docker-compose-example.yml +++ b/docker-compose-example.yml @@ -8,6 +8,11 @@ services: - suwayomi=http://suwayomi:4567 # will proxy the suwayomi server to the UI # if you plan on proxying it externally then this is unnecessary + - theme=skeleton + # defaults to skeleton + # is for the SSR to stop off first loads + # any of the themes avalabe in VUI + # skeleton, wintry, crimson, gold-nouveau, hamlindigo, modern, rocket, sahara, seafoam, vintage restart: unless-stopped vui3-dev: diff --git a/set-env-variable.sh b/set-env-variable.sh index 5e04dfe2..a823494a 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -19,4 +19,7 @@ $1=="nameserver" && $2!~/^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.?){4}$/{ print "["$2"]" }' /etc/resolv.conf) sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf -sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf \ No newline at end of file +sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf + +TMPTHEME=$(echo "$theme" | sed "skeleton") +find . -type f -name '*.html' -print0 | xargs -0 sed -i "" "s@data-theme='skeleton'@data-theme='$TMPTHEME'@" From 717e6d16576258b3d1228f3d4fd7857a5b97dca5 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:50:42 +0100 Subject: [PATCH 44/54] versionToServerVersionMapping --- README.md | 5 +++++ versionToServerVersionMapping.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e22f6144..87bd4506 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,11 @@ services: - suwayomi=http://suwayomi:4567/ # will proxy the suwayomi server to the UI # if you plan on proxying it externally then this is unnecessary + - theme=skeleton + # defaults to skeleton + # is for the SSR to stop off first loads + # any of the themes avalabe in VUI + # skeleton, wintry, crimson, gold-nouveau, hamlindigo, modern, rocket, sahara, seafoam, vintage restart: unless-stopped ``` diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json index 58f53a28..1b81a285 100644 --- a/versionToServerVersionMapping.json +++ b/versionToServerVersionMapping.json @@ -5,7 +5,7 @@ }, { "tag": "v1.1.0", - "uiVersion": "r1001", + "uiVersion": "r1034", "serverVersion": "r1502", "comment": "the server version is between 1.0.0 and 1.1.0 release", "comment2": "because its the preview version that implemented the breaking changes" From 2210c71f0c5c336c3c4f40adfaab173c74e89008 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 16:59:46 +0100 Subject: [PATCH 45/54] fix --- set-env-variable.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/set-env-variable.sh b/set-env-variable.sh index a823494a..46a2b43d 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -22,4 +22,4 @@ sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf TMPTHEME=$(echo "$theme" | sed "skeleton") -find . -type f -name '*.html' -print0 | xargs -0 sed -i "" "s@data-theme='skeleton'@data-theme='$TMPTHEME'@" +find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='$TMPTHEME'/g" {} \; From 4512d0977a0a5e006bc79ba31a6bf94bef729dd0 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 17:02:25 +0100 Subject: [PATCH 46/54] test --- set-env-variable.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/set-env-variable.sh b/set-env-variable.sh index 46a2b43d..01212c97 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -21,5 +21,4 @@ $1=="nameserver" && $2!~/^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.?){4}$/{ sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf -TMPTHEME=$(echo "$theme" | sed "skeleton") -find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='$TMPTHEME'/g" {} \; +find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='${theme:=skeleton}/g" {} \; From 5e53bd0e8022abfaabb3df91b19077daeaf51891 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 17:06:56 +0100 Subject: [PATCH 47/54] test --- set-env-variable.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/set-env-variable.sh b/set-env-variable.sh index 01212c97..2d5f6c53 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -21,4 +21,4 @@ $1=="nameserver" && $2!~/^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.?){4}$/{ sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf -find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='${theme:=skeleton}/g" {} \; +# find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='${theme:=skeleton}/g" {} \; \ No newline at end of file From 3853ad352eddf68143631214d1b830dc726e3d87 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 17:16:42 +0100 Subject: [PATCH 48/54] light --- docker-compose-example.yml | 6 +++++- set-env-variable.sh | 7 ++++++- src/app.html | 6 ------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docker-compose-example.yml b/docker-compose-example.yml index 327a88d0..cb72c376 100644 --- a/docker-compose-example.yml +++ b/docker-compose-example.yml @@ -9,10 +9,14 @@ services: # will proxy the suwayomi server to the UI # if you plan on proxying it externally then this is unnecessary - theme=skeleton - # defaults to skeleton # is for the SSR to stop off first loads + # defaults to skeleton # any of the themes avalabe in VUI # skeleton, wintry, crimson, gold-nouveau, hamlindigo, modern, rocket, sahara, seafoam, vintage + - light=false + # is for the SSR to stop off first loads + # defaults to false + # true will turn on the light mode restart: unless-stopped vui3-dev: diff --git a/set-env-variable.sh b/set-env-variable.sh index 2d5f6c53..19f1f5c9 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -21,4 +21,9 @@ $1=="nameserver" && $2!~/^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.?){4}$/{ sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf -# find . -name '*.html' -exec sed -i -e "s/data-theme='skeleton'/data-theme='${theme:=skeleton}/g" {} \; \ No newline at end of file +cd /usr/share/nginx/html +find . -name '*.html' -exec sed -i -e "s/data-theme="skeleton"/data-theme='${theme:=skeleton}/g" {} \; + +if [[ "${light}" = "true" || "${light}" = "True" || "${light}" = "TRUE" ]]; then + find . -name '*.html' -exec sed -i -e "s///g" {} \; +fi \ No newline at end of file diff --git a/src/app.html b/src/app.html index 1d689520..ad06b9ca 100644 --- a/src/app.html +++ b/src/app.html @@ -9,12 +9,6 @@ - Date: Fri, 21 Jun 2024 17:51:56 +0100 Subject: [PATCH 49/54] Set Build version --- .github/workflows/build.yml | 5 ++++- set-env-variable.sh | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5ce08eb..887c1120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,10 @@ jobs: run: bun i - run: bun run build - run: echo "${{ needs.GenTag.outputs.value }}" > ./build/revision - - run: sed -i "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" ./build/index.html + - name: Set Build version + run: | + cd ./build + find . -name '*.html' -exec sed -i -e "s@BUILD_VERSION_PLACEHOLDER@${{ needs.GenTag.outputs.value }}@" {} \; - run: bun run build-md5 - uses: actions/upload-artifact@v4 with: diff --git a/set-env-variable.sh b/set-env-variable.sh index 19f1f5c9..0ea0af27 100644 --- a/set-env-variable.sh +++ b/set-env-variable.sh @@ -22,8 +22,9 @@ sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf cd /usr/share/nginx/html -find . -name '*.html' -exec sed -i -e "s/data-theme="skeleton"/data-theme='${theme:=skeleton}/g" {} \; +${theme:="skeleton"} +find . -name '*.html' -exec sed -i -e "s/data-theme=\"skeleton\"/data-theme=\"$theme\"/g" {} \; if [[ "${light}" = "true" || "${light}" = "True" || "${light}" = "TRUE" ]]; then - find . -name '*.html' -exec sed -i -e "s///g" {} \; + find . -name '*.html' -exec sed -i -e 's///g' {} \; fi \ No newline at end of file From b34ce4e3fae22e3441d639453c36ca1c31496023 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 17:59:26 +0100 Subject: [PATCH 50/54] versionToServerVersionMapping --- default.conf | 9 --------- versionToServerVersionMapping.json | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/default.conf b/default.conf index 9fa88652..1075a1bc 100644 --- a/default.conf +++ b/default.conf @@ -16,13 +16,4 @@ server { proxy_set_header Connection $http_connection; proxy_set_header Upgrade $http_upgrade; } - - # location /v1 { - # resolver resolverPLACEHOLDER 8.8.8.8 valid=30s ipv6=off; - # set $upstreame https://api.mangaupdates.com; - # proxy_pass $upstreame; - # proxy_http_version 1.1; - # proxy_set_header Connection $http_connection; - # proxy_set_header Upgrade $http_upgrade; - # } } \ No newline at end of file diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json index 1b81a285..d0b73f92 100644 --- a/versionToServerVersionMapping.json +++ b/versionToServerVersionMapping.json @@ -5,7 +5,7 @@ }, { "tag": "v1.1.0", - "uiVersion": "r1034", + "uiVersion": "r1040", "serverVersion": "r1502", "comment": "the server version is between 1.0.0 and 1.1.0 release", "comment2": "because its the preview version that implemented the breaking changes" From 3fea504bb6d197204676604c5cef800c25b64efb Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Fri, 21 Jun 2024 18:07:44 +0100 Subject: [PATCH 51/54] remove the flashbang --- src/app.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app.html b/src/app.html index ad06b9ca..82bf72cf 100644 --- a/src/app.html +++ b/src/app.html @@ -9,6 +9,12 @@ + Date: Fri, 21 Jun 2024 18:11:32 +0100 Subject: [PATCH 52/54] versionToServerVersionMapping --- versionToServerVersionMapping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json index d0b73f92..00daea81 100644 --- a/versionToServerVersionMapping.json +++ b/versionToServerVersionMapping.json @@ -5,7 +5,7 @@ }, { "tag": "v1.1.0", - "uiVersion": "r1040", + "uiVersion": "r1042", "serverVersion": "r1502", "comment": "the server version is between 1.0.0 and 1.1.0 release", "comment2": "because its the preview version that implemented the breaking changes" From 8836939e96bf2ac405e558ae7b018c4b7a54538f Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Tue, 25 Jun 2024 19:09:12 +0100 Subject: [PATCH 53/54] History --- .vscode/settings.json | 3 +- src/lib/AppNavData.ts | 23 ++ src/lib/components/MobileAppNavigation.svelte | 37 +- src/lib/gql/Queries.ts | 29 ++ src/lib/util.ts | 28 ++ src/routes/(app)/history/+page.svelte | 178 +++++++++ .../[MangaID]/(manga)/chaptersSide.svelte | 350 ++++++++++-------- src/routes/(app)/more/+page.svelte | 26 ++ src/routes/(app)/updates/+page.svelte | 5 +- src/routes/+layout.ts | 4 +- 10 files changed, 509 insertions(+), 174 deletions(-) create mode 100644 src/routes/(app)/history/+page.svelte create mode 100644 src/routes/(app)/more/+page.svelte diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f98304c..d81e0312 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -137,5 +137,6 @@ "codeium.enableInComments": false, "codeium.enableSearch": true, "tailwind-fold.unfoldIfLineSelected": true, - "tailwind-fold.foldLengthThreshold": 5 + "tailwind-fold.foldLengthThreshold": 80, + "tailwind-fold.unfoldedTextOpacity": 1 } diff --git a/src/lib/AppNavData.ts b/src/lib/AppNavData.ts index 9f1cbad8..499ac05d 100644 --- a/src/lib/AppNavData.ts +++ b/src/lib/AppNavData.ts @@ -29,6 +29,14 @@ export const AppNavData = [ return page.includes('/browse'); } }, + { + href: '/history', + title: 'History', + icon: 'mdi:history', + match: (page: string) => { + return page.includes('/history'); + } + }, { href: '/downloads', title: 'Downloads', @@ -46,3 +54,18 @@ export const AppNavData = [ } } ]; + +export const SmallAppNavData = [ + AppNavData[0], + AppNavData[1], + AppNavData[2], + AppNavData[3], + { + href: '/more', + title: 'More', + icon: 'mdi:dots-horizontal', + match: (page: string) => { + return page.includes('/more'); + } + } +]; diff --git a/src/lib/components/MobileAppNavigation.svelte b/src/lib/components/MobileAppNavigation.svelte index 44f62632..d6596808 100644 --- a/src/lib/components/MobileAppNavigation.svelte +++ b/src/lib/components/MobileAppNavigation.svelte @@ -10,7 +10,9 @@ import { page } from '$app/stores'; import { TabGroup, TabAnchor } from '@skeletonlabs/skeleton'; import IconWrapper from './IconWrapper.svelte'; - import { AppNavData } from '../AppNavData'; + import { AppNavData, SmallAppNavData } from '../AppNavData'; + import { screens } from '$lib/screens'; + import MediaQuery from './MediaQuery.svelte'; - {#each AppNavData as Loc} - -
- - {Loc.title} -
- - {/each} + + {@const Nav = matches ? SmallAppNavData : AppNavData} + {#each Nav as Loc} + +
+ + {Loc.title} +
+ + {/each} + diff --git a/src/lib/gql/Queries.ts b/src/lib/gql/Queries.ts index c9e8091a..338f5800 100644 --- a/src/lib/gql/Queries.ts +++ b/src/lib/gql/Queries.ts @@ -495,3 +495,32 @@ export const categoryMangaNotInLibrary = graphql( `, [] ); + +export const History = graphql(` + query History($offset: Int = 0) { + chapters( + condition: { isRead: true } + orderByType: DESC + orderBy: LAST_READ_AT + first: 100 + offset: $offset + ) { + totalCount + nodes { + id + name + lastReadAt + isDownloaded + isBookmarked + manga { + thumbnailUrl + id + title + } + } + pageInfo { + hasNextPage + } + } + } +`); diff --git a/src/lib/util.ts b/src/lib/util.ts index 4e1ccfc4..2ab23c44 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -298,3 +298,31 @@ type hasEnumVals = { function isENUM(enu: unknown): enu is hasEnumVals { return enu instanceof Object && 'enumValues' in enu; } + +export function formatDate(date: Date) { + const diff = new Date().valueOf() - date.valueOf(); // the difference in milliseconds + const msPerMinute = 60 * 1000; + const msPerHour = msPerMinute * 60; + const msPerDay = msPerHour * 24; + const msPerMonth = msPerDay * 30; + const msPerYear = msPerDay * 365; + + if (date.toDateString() === new Date().toDateString()) { + return date.toLocaleTimeString(); + } + if (diff < msPerMinute) { + return Math.round(diff / 1000) + ' seconds ago'; + } else if (diff < msPerHour) { + return Math.round(diff / msPerMinute) + ' minutes ago'; + } else if (diff < msPerDay) { + return Math.round(diff / msPerHour) + ' hours ago'; + } else if (diff < msPerMonth) { + return Math.round(diff / msPerDay) + ' days ago'; + } else if (diff < msPerYear) { + return Math.round(diff / msPerMonth) + ' months ago'; + } else { + return Math.round(diff / msPerYear) + ' years ago'; + } + + return date.toLocaleString(); +} diff --git a/src/routes/(app)/history/+page.svelte b/src/routes/(app)/history/+page.svelte new file mode 100644 index 00000000..fcd2e625 --- /dev/null +++ b/src/routes/(app)/history/+page.svelte @@ -0,0 +1,178 @@ + + + + +{#if !$all && $CurrentHistory.fetching} +
+ {#each new Array(110) as _} +
+
+ {#if $Meta.Display === display.Comfortable} +
+ {/if} +
+ {/each} +
+{:else if !$all && $CurrentHistory.error} +
+ {JSON.stringify($CurrentHistory.error, null, 4)} +
+{:else if $all?.nodes} +
+ {#each $all.nodes as updat} + + {#if intersecting} + + + {#if $Meta.Display === display.Compact} +
+
+ {updat.manga.title} +
+
+ {updat.name} +
+
+ {formatDate(new Date(parseInt(updat.lastReadAt) * 1000))} +
+
+ {/if} +
+ {#if updat.isDownloaded} + + {/if} + {#if updat.isBookmarked} + + {/if} +
+ + {#if $Meta.Display === display.Comfortable} +
+
+ {updat.manga.title} +
+
+ {updat.name} +
+
+ {new Date(parseInt(updat.lastReadAt) * 1000).toLocaleString()} +
+
+ {/if} + + {/if} + + {/each} + {#if !$CurrentHistory.fetching && $all.pageInfo.hasNextPage} + { + if (e.detail) $page = $all?.nodes.length ?? 0; + }} + /> + {/if} + {#if $CurrentHistory.fetching && $all.pageInfo.hasNextPage} + {#each new Array(10) as _} +
+
+ {#if $Meta.Display === display.Comfortable} +
+ {/if} +
+ {/each} + {/if} +
+{/if} diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte index 1d6971e5..ba75bd75 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte @@ -186,6 +186,46 @@ component: { ref: ChaptersFilterModal, props: { MangaID } } }); } + + let scrollTo = true; + let _scrollToChaps: HTMLDivElement[] = []; + let scrollToChaps: HTMLDivElement | undefined; + $: if (scrollTo && _scrollToChaps) handelScrollToChaps(); + + function handelScrollToChaps() { + let ind = _scrollToChaps + .filter((e) => e) + .findIndex((e) => e.id === location.hash); + + if (ind !== -1 && ind - 3 > 0) { + scrollToChaps = _scrollToChaps[ind - 3]; + } + } + + $: if (scrollTo && scrollToChaps) scroll(); + + function isScrollable(elem: HTMLElement | undefined) { + if (!elem) return false; + return ( + elem.scrollWidth > elem.clientWidth || + elem.scrollHeight > elem.clientHeight + ); + } + + function scroll() { + scrollTo = false; + const { top, height } = scrollToChaps?.getBoundingClientRect() ?? { + top: 0 + }; + let scrollElement; + if (isScrollable(chapterSideElement)) { + scrollElement = chapterSideElement; + } else scrollElement = document.querySelector('#page'); + scrollElement?.scrollTo({ + top: top + scrollElement.scrollTop + (height ?? 0) / 2, + behavior: 'smooth' + }); + } {#if !$manga || $manga.fetching} @@ -337,7 +377,7 @@
- {#each sortedChapters as chapter (chapter.id)} + {#each sortedChapters as chapter, index (chapter.id)} - {#if intersecting} - $selectMode || LongHandler()} - href="/manga/{mangaFrag?.id}/chapter/{chapter.id}" - on:click={(e) => { - if (e.ctrlKey) return; - if ($selectMode) { - e.preventDefault(); - e.stopPropagation(); - lastSelected = HelpDoSelect( - chapter, - e, - lastSelected, - sortedChapters, - selected - ); - } - }} - > - {#if chapter.isBookmarked} - - {/if} -
-
- {$mangaMeta.ChapterTitle === ChapterTitle['Source Title'] - ? chapter.name - : `Chapter ${chapter.chapterNumber}`} -
-
- {new Date( - $mangaMeta.ChapterFetchUpload - ? parseInt(chapter.uploadDate) - : parseInt(chapter.fetchedAt) * 1000 - ).toLocaleDateString()}{chapter.isDownloaded - ? ' • Downloaded' - : ''}{chapter.scanlator ? ` • ${chapter.scanlator}` : ''} + - e.chapter.id === chapter.id - )} - /> + e.chapter.id === chapter.id + )} + /> - {#if $selectMode} - + {/if} + - {/if} - - -
-
- {#if chapter.isDownloaded} - - {:else} - - {/if} - {#if chapter.isBookmarked} - - {:else} + +
+
+ {#if chapter.isDownloaded} + + {:else} + + {/if} + {#if chapter.isBookmarked} + + {:else} + + {/if} + {#if chapter.isRead} + + {:else} + + {/if} - {/if} - {#if chapter.isRead} - - {:else} - - {/if} - +
+
-
-
- {/if} + {/if} +
{/each} diff --git a/src/routes/(app)/more/+page.svelte b/src/routes/(app)/more/+page.svelte new file mode 100644 index 00000000..c4620ebd --- /dev/null +++ b/src/routes/(app)/more/+page.svelte @@ -0,0 +1,26 @@ + + + + + +
Downloads
+ + + + +
Settings
+ diff --git a/src/routes/(app)/updates/+page.svelte b/src/routes/(app)/updates/+page.svelte index 6b17cc7e..9c45d058 100644 --- a/src/routes/(app)/updates/+page.svelte +++ b/src/routes/(app)/updates/+page.svelte @@ -19,6 +19,7 @@ import type { UpdateNode } from './UpdatesStores'; import { dlreabook, + formatDate, gridValues, HelpDoSelect, HelpSelectAll @@ -188,9 +189,7 @@ parseInt(updat.fetchedAt) * 1000 ).toLocaleString()} > - {new Date( - parseInt(updat.fetchedAt) * 1000 - ).toLocaleString()} + {formatDate(new Date(parseInt(updat.fetchedAt) * 1000))}
{/if} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 6025074b..bc83edc8 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -4,5 +4,5 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -export const ssr = true; -export const prerender = 'auto'; +export const ssr = false; +export const prerender = false; From 6e95513c5ebd87aa7a89fe96a930741e516adfb5 Mon Sep 17 00:00:00 2001 From: Robonau <30987265+Robonau@users.noreply.github> Date: Tue, 25 Jun 2024 19:23:41 +0100 Subject: [PATCH 54/54] lint --- .github/workflows/build.yml | 2 +- .github/workflows/check.yml | 4 ++-- .github/workflows/lint.yml | 2 +- README.md | 2 +- docker-compose-example.yml | 2 +- src/routes/(app)/history/+page.svelte | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 887c1120..bedac964 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: steps: - name: Check out Git repository uses: actions/checkout@v4 - - name: Use bun 1.1.0 + - name: Use bun latest uses: oven-sh/setup-bun@v1 with: bun-version: latest diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 98982aa5..2f798f1f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Use bun 1.0.10 + - name: Use bun latest uses: oven-sh/setup-bun@v1 with: bun-version: latest @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Use bun 1.0.10 + - name: Use bun latest uses: oven-sh/setup-bun@v1 with: bun-version: latest diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index df4e12ab..eaca8b09 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Use bun 1.0.10 + - name: Use bun latest uses: oven-sh/setup-bun@v1 with: bun-version: latest diff --git a/README.md b/README.md index 87bd4506..b97ea082 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ services: # if you plan on proxying it externally then this is unnecessary - theme=skeleton # defaults to skeleton - # is for the SSR to stop off first loads + # is for the SSR to stop off first loads # any of the themes avalabe in VUI # skeleton, wintry, crimson, gold-nouveau, hamlindigo, modern, rocket, sahara, seafoam, vintage restart: unless-stopped diff --git a/docker-compose-example.yml b/docker-compose-example.yml index cb72c376..5170f282 100644 --- a/docker-compose-example.yml +++ b/docker-compose-example.yml @@ -9,7 +9,7 @@ services: # will proxy the suwayomi server to the UI # if you plan on proxying it externally then this is unnecessary - theme=skeleton - # is for the SSR to stop off first loads + # is for the SSR to stop off first loads # defaults to skeleton # any of the themes avalabe in VUI # skeleton, wintry, crimson, gold-nouveau, hamlindigo, modern, rocket, sahara, seafoam, vintage diff --git a/src/routes/(app)/history/+page.svelte b/src/routes/(app)/history/+page.svelte index fcd2e625..3ca830e4 100644 --- a/src/routes/(app)/history/+page.svelte +++ b/src/routes/(app)/history/+page.svelte @@ -12,7 +12,7 @@ import { History } from '$lib/gql/Queries'; import { writable } from 'svelte/store'; import type { ResultOf } from '$lib/gql/graphql'; - import { formatDate, gridValues, HelpDoSelect } from '$lib/util'; + import { formatDate, gridValues } from '$lib/util'; import MangaCard from '$lib/components/MangaCard.svelte'; import IntersectionObserver from '$lib/components/IntersectionObserver.svelte'; import IconWrapper from '$lib/components/IconWrapper.svelte';