From 6572205982ddaa2a1a556ba9cb06d9717bf21a20 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Wed, 22 Feb 2023 09:09:54 -0300 Subject: [PATCH] [skip ci] Update github-related files to match upstream (#1314) * [skip ci] chore: Update workflows * chore: Update issue templates * chore: Update url in README --- .github/ISSUE_TEMPLATE.md | 4 +- .github/ISSUE_TEMPLATE/config.yml | 6 +-- .github/ISSUE_TEMPLATE/feature_request.md | 28 ------------ .github/ISSUE_TEMPLATE/meta_request.md | 30 ------------- .github/ISSUE_TEMPLATE/report_issue.yml | 13 +++--- .github/ISSUE_TEMPLATE/report_url_change.yml | 47 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/request_feature.yml | 7 ++- .github/ISSUE_TEMPLATE/request_source.yml | 10 ++--- .github/ISSUE_TEMPLATE/source_bug.md | 45 ------------------- .github/ISSUE_TEMPLATE/source_request.md | 30 ------------- .github/workflows/batch_close_issues.yml | 2 +- .github/workflows/build_pull_request.yml | 6 ++- .github/workflows/build_push.yml | 20 +++------ .github/workflows/cancel_pull_request.yml | 16 ------- .github/workflows/issue_closer.yml | 33 -------------- .github/workflows/issue_moderator.yml | 10 ++++- .github/workflows/lock.yml | 6 +-- README.md | 2 +- 18 files changed, 92 insertions(+), 223 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/ISSUE_TEMPLATE/meta_request.md create mode 100644 .github/ISSUE_TEMPLATE/report_url_change.yml delete mode 100644 .github/ISSUE_TEMPLATE/source_bug.md delete mode 100644 .github/ISSUE_TEMPLATE/source_request.md delete mode 100644 .github/workflows/cancel_pull_request.yml delete mode 100644 .github/workflows/issue_closer.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b531d3fda..90704dd7f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,11 +2,11 @@ I acknowledge that: -- I have updated to the latest version of the app (stable is v0.12.3.7) +- I have updated to the latest version of the app (stable is v0.12.3.10) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/jmir1/aniyomi - I have searched the existing issues for duplicates -- For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.jmir.xyz/extensions/ +- For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.org/extensions/ **DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT** diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 799d5364a..ab9370f08 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,11 +4,11 @@ contact_links: url: https://github.com/jmir1/aniyomi/issues/new/choose about: Issues and requests about the app itself should be opened in the tachiyomi repository instead - name: 📦 Aniyomi extensions - url: https://aniyomi.jmir.xyz/extensions + url: https://aniyomi.org/extensions about: List of all available extensions with download links - name: 🖥️ Aniyomi website - url: https://aniyomi.jmir.xyz/help/ - about: Common questions are answered here. + url: https://aniyomi.org/help/ + about: Guides, troubleshooting, and answers to common questions - name: Aniyomi app GitHub repository url: https://github.com/jmir1/aniyomi about: Issues about the app itself should be opened here instead. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 1b84af7ec..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: "🌟 Feature request" -title: "[Feature Request] : " -about: "Suggest a feature to improve a source" -labels: "enhancement" ---- - -**PLEASE READ THIS** - -I acknowledge that: - -- I have updated: - - To the latest version of the app (stable is v0.10.12) - - All extensions -- I have tried the troubleshooting guide: https://aniyomi.jmir.xyz/help/guides/troubleshooting-problems/ -- If this is an issue with the app itself, that I should be opening an issue in https://github.com/jmir1/aniyomi -- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue -- For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.jmir.xyz/extensions/ -- I will fill out the title and the information in this template - -Note that the issue will be automatically closed if you do not fill out the title or requested information. - -**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT** - ---- - -## What feature should be added to this source? -Explain why this should be added \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/meta_request.md b/.github/ISSUE_TEMPLATE/meta_request.md deleted file mode 100644 index 42e3499e6..000000000 --- a/.github/ISSUE_TEMPLATE/meta_request.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: "🧠 Meta feature request" -title: "[Meta] " -about: "Suggest improvements to the project" -labels: "meta" ---- - -**PLEASE READ THIS** - -I acknowledge that: - -- I have updated: - - To the latest version of the app (stable is v0.10.12) - - All extensions -- I have tried the troubleshooting guide: https://aniyomi.jmir.xyz/help/guides/troubleshooting-problems/ -- If this is an issue with the app itself, that I should be opening an issue in https://github.com/jmir1/aniyomi -- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue -- For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.jmir.xyz/extensions/ -- I will fill out the title and the information in this template - -Note that the issue will be automatically closed if you do not fill out the title or requested information. - -**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT** - ---- - -## Why/Project's Benefit/Existing Problem -Explain why this should be added - -## Other Details diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml index 33fa8674e..605369325 100644 --- a/.github/ISSUE_TEMPLATE/report_issue.yml +++ b/.github/ISSUE_TEMPLATE/report_issue.yml @@ -2,7 +2,6 @@ name: 🐞 Issue report description: Report a source issue in Aniyomi labels: [Bug] body: - - type: input id: source attributes: @@ -10,7 +9,7 @@ body: description: | You can find the extension name and version in **Browse → Extensions**. placeholder: | - Example: "Mangahere 1.3.18 (English)" + Example: "AnimePahe 13.19 (English)" validations: required: true @@ -48,13 +47,13 @@ body: required: true - type: input - id: tachiyomi-version + id: aniyomi-version attributes: label: Aniyomi version description: | You can find your Aniyomi version in **More → About**. placeholder: | - Example: "0.13.5" + Example: "0.12.3.10" or "Beta r6080" validations: required: true @@ -82,15 +81,15 @@ body: label: Acknowledgements description: Your issue will be closed if you haven't done these steps. options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue. required: true - label: I have written a short but informative title. required: true - - label: I have updated the app to version **[0.13.5](https://github.com/jmir1/aniyomi/releases/latest)**. + - label: I have updated the app to version **[0.12.3.10](https://github.com/jmir1/aniyomi/releases/latest)** required: true - label: I have updated all installed extensions. required: true - - label: I have tried the [troubleshooting guide](https://aniyomi.jmir.xyz/help/guides/troubleshooting/). + - label: I have tried the [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/). required: true - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/jmir1/aniyomi/issues/new/choose). required: true diff --git a/.github/ISSUE_TEMPLATE/report_url_change.yml b/.github/ISSUE_TEMPLATE/report_url_change.yml new file mode 100644 index 000000000..a73f2bb89 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/report_url_change.yml @@ -0,0 +1,47 @@ +name: 🔗 URL change report +description: Report a URL change for an existing source +labels: [Bug,Domain changed] +body: + - type: input + id: source + attributes: + label: Source information and language + description: | + You can find the extension name and version in **Browse → Extensions**. + placeholder: | + Example: "NotRealSource 13.1 (English)" + validations: + required: true + + - type: input + id: link + attributes: + label: Source new URL + placeholder: | + Example: "https://notrealsource.org" + validations: + required: true + + - type: textarea + id: other-details + attributes: + label: Other details + placeholder: | + Additional details and attachments. + + - type: checkboxes + id: acknowledgements + attributes: + label: Acknowledgements + description: Your issue will be closed if you haven't done these steps. + options: + - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue. + required: true + - label: I have written a short but informative title. + required: true + - label: I have updated all installed extensions. + required: true + - label: I have checked if the source URL is not already updated by opening WebView. + required: true + - label: I will fill out all of the requested information in this form. + required: true diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml index ba61006e8..d22732d33 100644 --- a/.github/ISSUE_TEMPLATE/request_feature.yml +++ b/.github/ISSUE_TEMPLATE/request_feature.yml @@ -1,8 +1,7 @@ name: ⭐ Feature request -description: Suggest a feature to improve a source +description: Suggest a feature to improve an existing source labels: [Feature request] body: - - type: input id: source attributes: @@ -10,7 +9,7 @@ body: description: | You can find the extension name in **Browse → Extensions**. placeholder: | - Example: "Mangahere (English)" + Example: "DopeBox (English)" validations: required: true @@ -38,7 +37,7 @@ body: label: Acknowledgements description: Your issue will be closed if you haven't done these steps. options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue. required: true - label: I have written a short but informative title. required: true diff --git a/.github/ISSUE_TEMPLATE/request_source.yml b/.github/ISSUE_TEMPLATE/request_source.yml index 397702434..b0b3f771b 100644 --- a/.github/ISSUE_TEMPLATE/request_source.yml +++ b/.github/ISSUE_TEMPLATE/request_source.yml @@ -2,13 +2,12 @@ name: 🌐 Source request description: Suggest a new source for Aniyomi labels: [Source request] body: - - type: input id: name attributes: label: Source name placeholder: | - Example: "Not Real Scans" + Example: "Not Real Source" validations: required: true @@ -17,7 +16,7 @@ body: attributes: label: Source link placeholder: | - Example: "https://notrealscans.org" + Example: "https://notrealsource.org" validations: required: true @@ -36,6 +35,7 @@ body: label: Other details placeholder: | Additional details and attachments. + Example: "+18/NSFW = yes" - type: checkboxes id: acknowledgements @@ -43,11 +43,11 @@ body: label: Acknowledgements description: Your issue will be closed if you haven't done these steps. options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue. required: true - label: I have written a title with source name. required: true - - label: I have checked that the extension does not already exist on the [website extensions list](https://aniyomi.jmir.xyz/extensions/) or the app. + - label: I have checked that the extension does not already exist on the [website extensions list](https://aniyomi.org/extensions/) or the app. required: true - label: I have checked that the extension does not already exist by searching the [GitHub repository](https://github.com/jmir1/aniyomi-extensions/) and verified it does not appear in the code base. required: true diff --git a/.github/ISSUE_TEMPLATE/source_bug.md b/.github/ISSUE_TEMPLATE/source_bug.md deleted file mode 100644 index 3f791355b..000000000 --- a/.github/ISSUE_TEMPLATE/source_bug.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -name: "🐞 Bug report" -title: "[Bug] : " -about: "Report a bug" -labels: "bug" ---- - -**PLEASE READ THIS** - -I acknowledge that: - -- I have updated: - - To the latest version of the app (stable is v0.10.12) - - All extensions -- I have tried the troubleshooting guide: https://aniyomi.jmir.xyz/help/guides/troubleshooting-problems/ -- If this is an issue with the app itself, that I should be opening an issue in https://github.com/jmir1/aniyomi -- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue -- For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.jmir.xyz/extensions/ -- I will fill out the title and the information in this template - -Note that the issue will be automatically closed if you do not fill out the title or requested information. - -**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT** - ---- - -## Device information -- Aniyomi version: ? -- Android version: ? - -## Source information -- Name: ? -- Extension version: ? - -## Steps to reproduce -1. First Step -2. Second Step - -### Expected behavior -Describe what should have happened - -### Actual behavior -Describe what happens instead - -## Other details diff --git a/.github/ISSUE_TEMPLATE/source_request.md b/.github/ISSUE_TEMPLATE/source_request.md deleted file mode 100644 index 0d817219f..000000000 --- a/.github/ISSUE_TEMPLATE/source_request.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: "🌐 Source Request" -title: "[Source Request] " -about: "Suggest a new source for Aniyomi" -labels: "Source Request" ---- - -**PLEASE READ THIS** - -I acknowledge that: - -- I have checked that the extension does not already exist: - - In the list of existing extensions in the application - - In the multi-source spreadsheet: https://aniyomi.jmir.xyz/extensions - - By searching the GitHub repository for the extension and verify it does not appear in the code base -- I have searched the existing GitHub issues and this extension does **NOT** have an open request -- I will fill out the title and the information in this template - -Note that the issue will be automatically closed if you do not fill out the title or requested information. - -**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT** - ---- - -## Source website -- Name: ? -- Link: ? -- Language(s): ? - -## Other details diff --git a/.github/workflows/batch_close_issues.yml b/.github/workflows/batch_close_issues.yml index 661661da1..e1d40cc4c 100644 --- a/.github/workflows/batch_close_issues.yml +++ b/.github/workflows/batch_close_issues.yml @@ -12,7 +12,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v5.1.0 + - uses: actions/stale@v7 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # Close everything older than ~6 months diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 5640686c3..100ad7aaf 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -5,6 +5,10 @@ on: paths-ignore: - '**.md' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + cancel-in-progress: true + env: CI_CHUNK_SIZE: 65 @@ -34,7 +38,7 @@ jobs: - id: get-changed-files name: Get changed files - uses: Ana06/get-changed-files@v2.1.0 + uses: Ana06/get-changed-files@v2.2.0 - id: parse-changed-files name: Parse changed files diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 5507ed88e..8d86c2e17 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -7,6 +7,10 @@ on: paths-ignore: - '**.md' +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: true + env: CI_CHUNK_SIZE: 65 @@ -20,20 +24,12 @@ jobs: env: CI_MODULE_GEN: true steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - all_but_latest: true - - name: Clone repo uses: actions/checkout@v3 - with: - ref: master - name: Find lib changes id: modified-libs - uses: tj-actions/changed-files@v32 + uses: tj-actions/changed-files@v35 with: files: lib/** files_ignore: lib/**.md @@ -144,8 +140,6 @@ jobs: steps: - name: Checkout master branch uses: actions/checkout@v3 - with: - ref: master - name: Set up JDK uses: actions/setup-java@v3 @@ -169,7 +163,7 @@ jobs: arguments: assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: "github.repository == 'jmir1/aniyomi-extensions'" with: name: "individual-apks-${{ matrix.chunk }}" @@ -187,7 +181,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download APK artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/apk-artifacts diff --git a/.github/workflows/cancel_pull_request.yml b/.github/workflows/cancel_pull_request.yml deleted file mode 100644 index 0458f4210..000000000 --- a/.github/workflows/cancel_pull_request.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Cancel old pull request workflows - -on: - workflow_run: - workflows: ["PR build check"] - types: - - requested - -jobs: - cancel: - runs-on: ubuntu-latest - steps: - - uses: styfle/cancel-workflow-action@0.9.1 - with: - workflow_id: ${{ github.event.workflow.id }} - all_but_latest: true diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml deleted file mode 100644 index 039548998..000000000 --- a/.github/workflows/issue_closer.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Issue closer - -on: - issues: - types: [opened, edited, reopened] - -jobs: - autoclose: - runs-on: ubuntu-latest - steps: - - name: Autoclose issues - uses: arkon/issue-closer-action@v3.4 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - ignoreLabel: do-not-autoclose - rules: | - [ - { - "type": "title", - "regex": ".*<(Source Name|short description)>*", - "message": "You did not fill out the description in the title" - }, - { - "type": "body", - "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*", - "message": "The acknowledgment section was not removed" - }, - { - "type": "body", - "regex": ".*\\* (Aniyomi version|Android version|Device|Name|Link|Extension version): \\?.*", - "message": "The requested information was not filled out" - } - ] diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index f24824a23..71af8325f 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -16,6 +16,8 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} duplicate-check-enabled: true duplicate-check-label: Source request + existing-check-enabled: true + existing-check-label: Source request auto-close-rules: | [ { @@ -31,7 +33,13 @@ jobs: { "type": "title", "regex": ".*(Source name|Short description).*", - "message": "You did not fill out the description in the title" + "message": "You did not fill out the description in the title." + }, + { + "type": "both", + "regex": ".*(?:fail(?:ed|ure)?|can\\s*(?:no|')?t|unable|get past|(?