diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd3edf93..5c6f945d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -195,33 +195,6 @@ jobs: name: conveyor-make-copied-site path: ~/.cache/hydraulic/conveyor/logs/log.latest.txt - - name: Conveyor make old-site - uses: hydraulic-software/conveyor/actions/build@v13.0 - if: inputs.github_release - with: - command: --cache-limit=2.0 -f conveyor.ci.conf make old-site -o ./output/old-site - signing_key: ${{ secrets.CONVEYOR_SIGNING_KEY }} - agree_to_license: 1 - env: - APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }} - APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }} - AWS_S3_BUCKET: ${{ secrets.B2_BUCKET }} - AWS_S3_ENDPOINT: 'https://s3.us-east-005.backblazeb2.com' - AWS_ACCESS_KEY_ID: ${{ secrets.B2_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.B2_SECRET_ACCESS_KEY }} - - name: Upload Conveyor log - if: always() && inputs.github_release - uses: actions/upload-artifact@v4 - with: - name: conveyor-make-old-site - path: ~/.cache/hydraulic/conveyor/logs/log.latest.txt - - - name: Adjust Conveyor old-site output - if: inputs.github_release - run: | - rm ./output/old-site/download.html - rm ./output/old-site/icon.svg - - name: JReleaser Release if: inputs.github_release uses: gradle/gradle-build-action@v2 diff --git a/build.gradle.kts b/build.gradle.kts index 069d6955..73a627c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -147,16 +147,6 @@ jreleaser { } } - files { - active = Active.RELEASE - // workaround as glob doesn't seem to work https://github.com/jreleaser/jreleaser/issues/1466 - file("./output/old-site").listFiles()?.forEach { - artifact { - path = it - } - } - } - distributions { create("komga") { active = Active.RELEASE diff --git a/conveyor.conf b/conveyor.conf index f5b0017e..d02e24a0 100644 --- a/conveyor.conf +++ b/conveyor.conf @@ -55,7 +55,6 @@ app { site { base-url = "https://download.komga.org" - move-from.base-url = "https://github.com/gotson/komga/releases/latest/download" } }