From 10b6caf9f51f4ec975098700d039a4b5773204d1 Mon Sep 17 00:00:00 2001 From: NoDRM Date: Thu, 3 Aug 2023 21:21:49 +0200 Subject: [PATCH] Enable autorelease into 2nd repo --- .github/workflows/main.yml | 71 ++++++++++++++++---------------------- DeDRM_plugin/adobekey.py | 1 + README.md | 8 +++-- 3 files changed, 35 insertions(+), 45 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0cfcf2c..af937d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,46 +20,33 @@ jobs: path: | DeDRM_tools_*.zip DeDRM_tools.zip + + - name: Prepare release + run: cp DeDRM_tools.zip DeDRM_alpha_${{ github.sha }}.zip -# - name: Delete old release -# uses: cb80/delrel@latest -# with: -# tag: autorelease -# token: ${{ github.token }} -# -# - name: Delete old tag -# uses: dev-drprasad/delete-tag-and-release@v1.0 -# with: -# tag_name: autorelease -# github_token: ${{ github.token }} -# delete_release: true -# -# - name: Prepare release -# run: cp DeDRM_tools.zip DeDRM_alpha_${{ github.sha }}.zip -# -# - name: Auto-release -# id: autorelease -# uses: softprops/action-gh-release@v1 -# with: -# tag_name: autorelease -# token: ${{ github.token }} -# name: Automatic alpha release with latest changes -# body: | -# This release is automatically generated by Github for each commit. -# -# This means, every time a change is made to this repo, this release will be updated to contain an untested copy of the plugin at that stage. This will contain the most up-to-date code, but it's not tested at all and may be broken. -# -# Last update based on Git commit ${{ github.sha }}. -# prerelease: true -# draft: true -# files: DeDRM_alpha_${{ github.sha }}.zip -# -# - name: Make release public -# uses: irongut/EditRelease@v1.2.0 -# with: -# token: ${{ github.token }} -# id: ${{ steps.autorelease.outputs.id }} -# draft: false -# prerelease: true -# -# \ No newline at end of file + + - uses: dev-drprasad/delete-older-releases@v0.2.1 + with: + repo: noDRM/DeDRM_tools_autorelease + keep_latest: 0 + delete_tags: true + env: + GITHUB_TOKEN: ${{ secrets.AUTORELEASE_KEY }} + + - name: Auto-release + id: autorelease + uses: softprops/action-gh-release@v1 + with: + tag_name: autorelease_${{ github.sha }} + repository: noDRM/DeDRM_tools_autorelease + token: ${{ secrets.AUTORELEASE_KEY }} + name: Automatic alpha release with latest changes + body: | + This release is automatically generated by Github for each commit. + + This means, every time a change is made to the repo, a release with an untested copy of the plugin at that stage will be created. This will contain the most up-to-date code, but it's not tested at all and may be broken. + + Last update based on Git commit [${{ github.sha }}](https://github.com/noDRM/DeDRM_tools/commit/${{ github.sha }}). + prerelease: true + draft: false + files: DeDRM_alpha_${{ github.sha }}.zip diff --git a/DeDRM_plugin/adobekey.py b/DeDRM_plugin/adobekey.py index 7dc7671..5ad771f 100644 --- a/DeDRM_plugin/adobekey.py +++ b/DeDRM_plugin/adobekey.py @@ -44,6 +44,7 @@ __version__ = '7.4' import sys, os, struct, getopt from base64 import b64decode +#@@CALIBRE_COMPAT_CODE@@ from .utilities import SafeUnbuffered diff --git a/README.md b/README.md index 4e91292..b04af46 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,13 @@ DeDRM tools for ebooks This is a fork of Apprentice Harper's version of the DeDRM tools. Apprentice Harper said that the original version of the plugin [is no longer maintained](https://github.com/apprenticeharper/DeDRM_tools#no-longer-maintained), so I've taken over, merged a bunch of open PRs, and added a ton more features and bugfixes. -The latest stable (released) version is v10.0.3 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3). +The latest stable (released) version is v10.0.3 which [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.3). The latest beta is v10.0.9, as a release candidate for v10.1.0. It [can be downloaded here](https://github.com/noDRM/DeDRM_tools/releases/tag/v10.0.9). -Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). This plugin will start with version v10.0.0. +The latest alpha version is available [at this link](https://github.com/noDRM/DeDRM_tools_autorelease/releases). This version is completely untested and will contain the latest code changes in this repository. With each commit in this repository, a new automatic alpha version will be uploaded there. If you want the most up-to-date code to test things and are okay with the plugin occasionally breaking, you can download this version. -The v10.0.0 versions of this plugin should both work with Calibre 5.x (Python 3) as well as Calibre 4.x and lower (Python 2). If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report. +Take a look at [the CHANGELOG](https://github.com/noDRM/DeDRM_tools/blob/master/CHANGELOG.md) to see a list of changes since the last version by Apprentice Harper (v7.2.1). + +My version of the plugin should both work with Calibre 5.x/6.x (Python 3) as well as Calibre 4.x and lower (Python 2). If you encounter issues with this plugin in Calibre 4.x or lower, please open a bug report. # Original README from Apprentice Harper