Skip to content

Commit

Permalink
Merge branch 'arichornlover:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Shaukariya authored May 12, 2024
2 parents f524107 + 90de768 commit 2ddda16
Show file tree
Hide file tree
Showing 86 changed files with 2,473 additions and 1,392 deletions.
39 changes: 24 additions & 15 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
name: Bug
description: Make sure you complete the template. Otherwise, it will be closed without further explanation!
description: Report a bug here
title: "[Bug] Replace this with your title"
labels: bug
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered. **I DIDN\'T MAKE THIS CHECKBOX FOR COSMETICS**
options:
- label: I have searched the existing issues
required: true

- type: checkboxes
attributes:
label: Have you read the FAQ?
description: Make sure you actually visit the [**FAQ**](https://github.com/qnblackcat/uYouPlus/wiki/FAQ) page! **I DIDN\'T MAKE THIS CHECKBOX FOR COSMETICS**
label: Have you read the Wiki?
description: |
Please ensure you have read the [**Wiki**](https://github.com/arichornlover/uYouEnhanced/wiki)
options:
- label: Yes, I did read the FAQ
- label: Yes, I have read the Wiki
required: true

- type: markdown
Expand All @@ -26,30 +26,41 @@ body:
- type: input
attributes:
label: iOS/iPadOS version
placeholder: iOS 17.4
validations:
required: true

- type: input
attributes:
label: Device model
placeholder: iPhone 15 Pro Max
validations:
required: true

- type: input
attributes:
label: Sideload tool
placeholder: AltStore, Sideloadly, TrollStore, ...
label: Sideload method
placeholder: AltStore, Sideloadly, TrollStore, Signulous, deb, ...
validations:
required: true

- type: input
attributes:
label: Tweak version
placeholder: uYouEnhanced/uYouPlusExtra/uYouPlus - v18.xx.x-3.0.1
placeholder: uYouEnhanced - v19.xx.x-3.0.3
description: "**latest or newest is NOT a version number!**"
validations:
required: true

- type: dropdown
attributes:
label: Do you use YouTube Premium?
options:
- ❌ No, I don't use YouTube Premium
- ✅ Yes, I do use YouTube Premium
validations:
required: true

- type: markdown
attributes:
value: "## Description"
Expand All @@ -76,23 +87,22 @@ body:
id: logs
attributes:
label: Crash log (if the app crashes)
description: If somehow the app crashes, **you must provide the crash log**. It can be found in your device's Settings App > Privacy > Analytics & Improvements > Analytics Data > Youtube-xxx-xxx.ips
description: It can be found in Settings App > Privacy > Analytics & Improvements > Analytics Data > Youtube-xxx-xxx.ips
render: shell

- type: dropdown
attributes:
label: Are you using the newest version of uYouPlus? If not, why?
description: Developers spend time and effort to fix bugs & add improvements with every release. Why don't you update to the [latest version](https://github.com/qnblackcat/uYouPlus/releases/latest) before reporting about an issue?
label: Are you using the newest version of uYouEnhanced?
description: Update to the [latest version](https://github.com/arichornlover/uYouEnhanced/releases) to see if it fixes your issue
options:
- ✅ Yes, I'm using the latest version of uYouPlus right now
- ❌ No, I'll explain at the end of the template
- ✅ Yes, I'm using the latest version
- ❌ No, I'll explain at the end
validations:
required: true

- type: dropdown
attributes:
label: Does the issue happen with the official YouTube from AppStore?
description: Well, YouTube itself is buggy sometimes...
options:
- ❌ No, I can't reproduce this issue in the official YouTube from AppStore
- ✅ Yes, I can reproduce this issue in the official YouTube from AppStore
Expand All @@ -102,6 +112,5 @@ body:
- type: textarea
attributes:
label: Additional context
description: Um, anything else you want to say?
validations:
required: false
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Feature Request
description: Request a new feature to be added
title: "[Request] Replace with your question"
labels: enhancement
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
options:
- label: I have searched the existing issues
required: true

- type: dropdown
attributes:
label: Do you use YouTube Premium?
options:
- ❌ No, I don't use YouTube Premium
- ✅ Yes, I do use YouTube Premium
validations:
required: true

- type: textarea
attributes:
label: My feature request
validations:
required: true

- type: textarea
attributes:
label: Additional context
validations:
required: false
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,15 @@ labels: question
body:
- type: checkboxes
attributes:
label: Have you read the FAQ?
description: _Make sure you actually visit the [**FAQ**](https://github.com/qnblackcat/uYouPlus/wiki/FAQ) page! **I DON\'T MAKE THIS TICK BOX FOR COSMETIC**_
options:
- label: Yes, I did read the FAQ
required: true

- type: checkboxes
attributes:
label: Is there an existing issue/question for this?
description: _Please search to see if an issue already exists for the bug you encountered. **I DON\'T MAKE THIS TICK BOX FOR COSMETIC.**_
label: Is there an existing issue for this?
options:
- label: I have searched the existing issues
required: true

- type: dropdown
attributes:
label: Do you think this is a bug?
description: _If you think this is a bug, please open a new issue with the bug template_
description: _If so, please use the bug template_
multiple: false
options:
- ✅ Yes, I believe this is a bug. I will open a new issue with the bug template
Expand All @@ -33,13 +24,11 @@ body:
- type: textarea
attributes:
label: My question
description: _Please enter your question here_
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: _Um, anything else you want to say?_
validations:
required: false
47 changes: 27 additions & 20 deletions .github/workflows/buildapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,45 @@ on:
workflow_dispatch:
inputs:
sdk_version:
description: "iOS SDK version to be used during build"
default: "16.2"
description: "iOS SDK Version"
default: "16.4"
required: true
type: string
uyou_version:
description: "The version of uYou"
description: "uYou Version"
default: "3.0.3"
required: true
type: string
decrypted_youtube_url:
description: "The direct URL to the decrypted YouTube ipa"
description: "Direct URL of the decrypted YouTube IPA"
default: ""
required: true
type: string
bundle_id:
description: "Modify the bundle ID. Not recommended"
description: "Modify the bundle ID"
default: "com.google.ios.youtube"
required: true
type: string
app_name:
description: "Modify the name of the app on the Home Screen. Not recommended"
description: "Modify the app name"
default: "YouTube"
required: true
type: string
create_release:
description: "Create a draft release"
default: true
commit_id:
description: "(Optional) Commit ID to build at"
default: ""
required: false
type: boolean
type: string
upload_artifact:
description: "Upload Artifact"
description: "Upload IPA as artifact"
default: true
required: false
type: boolean
create_release:
description: "Create a draft release"
default: false
required: false
type: boolean

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -49,7 +54,7 @@ concurrency:
jobs:
build:
name: Build uYouEnhanced
runs-on: macos-latest
runs-on: macos-12
permissions:
contents: write

Expand All @@ -58,6 +63,7 @@ jobs:
uses: actions/[email protected]
with:
path: main
ref: ${{ github.event.inputs.commit_id || github.ref }}
submodules: recursive

- name: Install Dependencies
Expand All @@ -70,13 +76,13 @@ jobs:
uses: actions/[email protected]
with:
repository: theos/theos
ref: 4bcc52914e0eeca719288522938185decaa8a1cb
ref: master
path: theos
submodules: recursive

- name: SDK Caching
id: SDK
uses: actions/[email protected].1
uses: actions/[email protected].2
env:
cache-name: iOS-${{ inputs.sdk_version }}-SDK
with:
Expand All @@ -87,7 +93,7 @@ jobs:
- name: Download iOS SDK
if: steps.SDK.outputs.cache-hit != 'true'
run: |
git clone --quiet -n --depth=1 --filter=tree:0 https://github.com/arichorn/sdks/
git clone --quiet -n --depth=1 --filter=tree:0 https://github.com/arichornlover/sdks/
cd sdks
git sparse-checkout set --no-cone iPhoneOS${{ inputs.sdk_version }}.sdk
git checkout
Expand Down Expand Up @@ -129,8 +135,9 @@ jobs:
id: build_package
run: |
cd ${{ github.workspace }}/main
sed -i '' "27s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile
sed -i '' "26s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile
sed -i '' "27s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile # Modify the bundle ID
sed -i '' "26s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile # Modify the app name
sed -i '' "1s#.*#export TARGET = iphone:clang:${{ inputs.sdk_version }}:14.0#g" Makefile # Modify the SDK version
make package THEOS_PACKAGE_SCHEME=rootless IPA=Payload/YouTube.app FINALPACKAGE=1
echo "package=$(ls -t packages | head -n1)" >>$GITHUB_OUTPUT
echo -e "==> \033[1mSHASUM256: $(shasum -a 256 packages/*.ipa | cut -f1 -d' ')\033[0m"
Expand All @@ -154,15 +161,15 @@ jobs:
if-no-files-found: error

- name: Create Release
if: ${{ inputs.create_release }}
id: create_release
uses: softprops/[email protected].1
uses: softprops/[email protected].4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
UYOU_VERSION: ${{ inputs.uyou_version }}
YOUTUBE_VERSION: ${{ steps.prepare_youtube.outputs.youtube_version }}
DRAFT: ${{ inputs.create_release }}
with:
tag_name: v${{ env.YOUTUBE_VERSION }}-${{ env.UYOU_VERSION }}-(${{ github.run_number }})
name: v${{ env.YOUTUBE_VERSION }}-${{ env.UYOU_VERSION }}-(${{ github.run_number }})
files: main/packages/*.ipa
draft: ${{ env.DRAFT }}
draft: true
39 changes: 25 additions & 14 deletions .github/workflows/delete-workflow-runs.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,56 @@
name: Delete Workflow Runs
name: Delete old workflow runs
on:
workflow_dispatch:
inputs:
days:
description: 'Number of days.'
description: 'Days-worth of runs to keep for each workflow'
required: true
default: 0
default: '7' # default value is "30"
minimum_runs:
description: 'The minimum runs to keep for each workflow.'
description: 'Minimum runs to keep for each workflow'
required: true
default: 0
default: '5' # default value is "6"
delete_workflow_pattern:
description: 'The name or filename of the workflow. if not set then it will target all workflows.'
description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
required: false
default: 'Build and Release uYouEnhanced' # default value is ""
delete_workflow_by_state_pattern:
description: 'Remove workflow by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
required: true
default: "All"
default: "ALL"
type: choice
options:
- "All"
- "ALL"
- active
- deleted
- disabled_inactivity
- disabled_manually
delete_run_by_conclusion_pattern:
description: 'Remove workflow by conclusion: action_required, cancelled, failure, skipped, success'
description: 'Remove runs based on conclusion: action_required, cancelled, failure, skipped, success'
required: true
default: "All"
default: "ALL"
type: choice
options:
- "All"
- "ALL"
- "Unsuccessful: action_required,cancelled,failure,skipped"
- action_required
- cancelled
- failure
- skipped
- success
dry_run:
description: 'Only log actions, do not perform any delete operations.'
description: 'Logs simulated changes, no deletions are performed'
required: false

# schedule:
# - cron: '0 0 * * *'

jobs:
del_runs:
runs-on: ubuntu-latest
permissions:
actions: write
contents: read
steps:
- name: Delete workflow runs
uses: Mattraks/delete-workflow-runs@v2
Expand All @@ -55,5 +61,10 @@ jobs:
keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
delete_run_by_conclusion_pattern: ${{ github.event.inputs.delete_run_by_conclusion_pattern }}
delete_run_by_conclusion_pattern: >-
${{
startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:')
&& 'action_required,cancelled,failure,skipped'
|| github.event.inputs.delete_run_by_conclusion_pattern
}}
dry_run: ${{ github.event.inputs.dry_run }}
Loading

0 comments on commit 2ddda16

Please sign in to comment.