Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into video_player
Browse files Browse the repository at this point in the history
  • Loading branch information
JoseAaronLopezGarcia committed Dec 27, 2024
2 parents 4fb48ec + 9351bea commit 15fea30
Show file tree
Hide file tree
Showing 1,206 changed files with 298,321 additions and 24,078 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* text=auto
#*.c text
#*.h text
*.l text
*.S text
*.py text
*.sh text eol=lf
*.bat text eol=crlf
164 changes: 119 additions & 45 deletions .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ labels: ["bug"]
body:
- type: markdown
attributes:
value: Thank you for taking the time to fill out and document any bugs.
value: |
Thank you for taking the time to fill out and document any bugs.
- type: dropdown
id: model
attributes:
label: PSP/Vita Model
description: "Please specify which device is affected/you have."
multiple: true
options:
- Any
- DTP-H1500 (Testing Tool)
- DTP-T1000 (Development Unit)
- PSP-1000 (Fat)
- PSP-2000 (Slim)
- PSP-3000 (Slim & Bright)
Expand All @@ -23,19 +27,16 @@ body:
- VTE-1000 (Vita TV)
validations:
required: true

- type: input
attributes:
label: ARK Version
description: "Enter Ark Release here (press Select it shows the version at the top of vshmenu). If using beta build put commit version."
validations:
required: true

- type: input
attributes:
label: Homebrew/GAME (if applicable)
description: "If using retail game please add GAME ID i.e: UCUS-98713"

- type: textarea
attributes:
label: Plugins ( if applicable )
Expand Down Expand Up @@ -67,13 +68,14 @@ body:
attributes:
label: USB Charge
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- XMB
- Launcher
validations:
required: true

Expand All @@ -82,13 +84,14 @@ body:
attributes:
label: Overclock
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- XMB
- Launcher
validations:
required: true

Expand All @@ -97,28 +100,40 @@ body:
attributes:
label: Power Save
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- XMB
- Launcher
validations:
required: true

- type: dropdown
id: autoboot
id: Balanced-Energy-Mode
attributes:
label: Autoboot Launcher
label: Balanced Energy Mode
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- XMB
- Launcher
validations:
required: true

- type: dropdown
id: autoboot
attributes:
label: Autoboot Launcher
options:
- "Off"
- "On"
validations:
required: true

Expand All @@ -127,13 +142,8 @@ body:
attributes:
label: Disable PSP Go Pause
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- "Off"
- "On"
validations:
required: true

Expand All @@ -148,7 +158,8 @@ body:
- UMD
- Homebrew
- Pops
- VSH
- XMB
- Launcher
validations:
required: true

Expand All @@ -163,7 +174,8 @@ body:
- UMD
- Homebrew
- Pops
- VSH
- XMB
- Launcher
validations:
required: true

Expand All @@ -172,12 +184,74 @@ body:
attributes:
label: Inferno Cache
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- VSH
- "Off"
- LRU
- RR
validations:
required: true

- type: dropdown
id: Skip-Sony-Logos
attributes:
label: Skip Sony Logos
options:
- "Off"
- "On"
validations:
required: true

- type: dropdown
id: Hide-PIC0-and_PIC1
attributes:
label: Hide PIC0 and PIC1
options:
- "Off"
- "On"
validations:
required: true

- type: dropdown
id: Hide-MAC-Address
attributes:
label: Hide MAC Address
options:
- "Off"
- "On"
validations:
required: true

- type: dropdown
id: Hide-DLC
attributes:
label: Hide DLC
options:
- "Off"
- "On"
validations:
required: true

- type: dropdown
id: Turn-off-LEDs
attributes:
label: Turn off LEDs
options:
- Disabled
- Always
- Game
- UMD
- Homebrew
- Pops
- XMB
- Launcher
validations:
required: true

- type: checkboxes
id: terms
attributes:
label: Verification of form.
description: Verify that you have indeed selected options above and filled out request properly and in full.
options:
- label: I agree that I properly filled out the items listed above.
required: true

Binary file added .github/screenshots/advanced_vsh.bmp
Binary file not shown.
Binary file added .github/screenshots/advanced_vsh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/screenshots/cfw_settings.bmp
Binary file not shown.
Binary file added .github/screenshots/classic_recovery_menu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/screenshots/infinity.bmp
Binary file not shown.
Binary file added .github/screenshots/pro_shell.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/screenshots/xmb_cfw_settings_extras.bmp
Binary file not shown.
Binary file added .github/screenshots/xmb_cfw_settings_game.bmp
Binary file not shown.
Binary file added .github/wallpapers/Jurassic_Park.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/wallpapers/Ubuntu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions .github/workflows/ark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,22 @@ on:
- '*.pptx'
- 'CHANGELOG.md'
branches: [ main ]
pull_request:
branches: [ main ]

schedule:
- cron: '0 0 * * *'
jobs:
check_date:
runs-on: ubuntu-latest
name: Check latest commit
outputs:
should_run: ${{ steps.should_run.outputs.should_run }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: print latest_commit
run: echo ${{ github.sha }}

- id: should_run
continue-on-error: true
name: check latest commit is less than a day
if: ${{ github.event_name == 'schedule' }}
run: test -z $(git rev-list --after="24 hours" ${{ github.sha }}) && echo "::set-output name=should_run::false"
run: test -z $(git rev-list --after="24 hours" ${{ github.sha }}) && echo "{name}={should_run::false}" >> $GITHUB_OUTPUT



Expand All @@ -45,9 +40,9 @@ jobs:
run: |
echo "VERSION=v$(date +%s)" >> $GITHUB_OUTPUT
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: sudo apt-get install autoconf automake bison flex gcc libmpfr-dev libncurses5-dev libreadline-dev libusb-dev make patch subversion texinfo wget git python3 python3-pip mkisofs && sudo pip3 install pycryptodome ecdsa
run: sudo apt-get install autoconf automake bison flex gcc libmpfr-dev libncurses5-dev libreadline-dev libusb-dev make patch subversion texinfo wget git python3 python3-pip python3-pycryptodome mkisofs && sudo pip3 install ecdsa pycryptodome
- name: Extract SDK
run: sudo 7z -o/usr/local/ x ./contrib/PC/PSPSDK/pspdev.7z
- name: Change Permissions
Expand Down Expand Up @@ -84,7 +79,7 @@ jobs:
- name: upload ARK Release & DEBUG artifact
id: create_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand All @@ -96,3 +91,9 @@ jobs:
ARK-4-${{ steps.get_version.outputs.VERSION }}.tar.gz
ARK-4-${{ steps.get_version.outputs.VERSION }}-DEBUG.zip
ARK-4-${{ steps.get_version.outputs.VERSION }}-DEBUG.tar.gz
- name: Update Test Server
# Please don't abuse this or I will have to revert back to the orginal way.
run: curl -L 'http://ark-4.ddns.net/automagic?update_test=1'
- name: Update Stable Server (because Acid is lazy for an ssk-keygen)
run: curl -L 'http://ark-4.ddns.net/automagic?update_rel=1'
65 changes: 65 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: ARK-4
on:
pull_request:
branches: [ main ]
paths-ignore:
- 'README.md'
- 'build.sh'
- '.github/ISSUES_TEMPLATE/*'
- '.github/screenshots/*'
- '.github/wallpapers/*'
- 'contrib/PC/ARKUpgrader'
- '*.pptx'
- 'CHANGELOG.md'
jobs:
check_date:
runs-on: ubuntu-latest
name: Check latest commit
outputs:
should_run: ${{ steps.should_run.outputs.should_run }}
steps:
- uses: actions/checkout@v4
- name: print latest_commit
run: echo ${{ github.sha }}

- id: should_run
continue-on-error: true
name: check latest commit is less than a day
if: ${{ github.event_name == 'schedule' }}
run: test -z $(git rev-list --after="24 hours" ${{ github.sha }}) && echo "{name}={should_run::false}" >> $GITHUB_OUTPUT



build:
needs: check_date
if: ${{ needs.check_date.outputs.should_run != 'false' }}
runs-on: ubuntu-latest
steps:
- name: Create Version
id: get_version
run: |
echo "VERSION=v$(date +%s)" >> $GITHUB_OUTPUT
- uses: actions/checkout@v4
- name: Install Dependencies
run: sudo apt-get install autoconf automake bison flex gcc libmpfr-dev libncurses5-dev libreadline-dev libusb-dev make patch subversion texinfo wget git python3 python3-pip python3-pycryptodome mkisofs && sudo pip3 install ecdsa pycryptodome
- name: Extract SDK
run: sudo 7z -o/usr/local/ x ./contrib/PC/PSPSDK/pspdev.7z
- name: Change Permissions
run: sudo chown $GITHUB_USER:$GITHUB_USER /usr/local/pspdev && sudo chmod 755 -R /usr/local/pspdev
- name: Setup Path
run: echo "/usr/local/pspdev/bin" >> $GITHUB_PATH
- name: Print PATH
run: echo $GITHUB_PATH
- name: Fix libmpfr
run: sudo ln -s /usr/lib/x86_64-linux-gnu/libmpfr.so.6 /usr/lib/x86_64-linux-gnu/libmpfr.so.4
- name: sign_np
run: cd .. && curl -OJL "https://github.com/swarzesherz/sign_np/archive/refs/tags/v1.0.2.tar.gz" && tar xvf sign_np-1.0.2.tar.gz && cd sign_np-1.0.2 && make && sudo cp sign_np /usr/local/pspdev/bin
- name: mkpsxiso
run: cd .. && curl -OJL "https://github.com/Lameguy64/mkpsxiso/releases/download/v2.03/mkpsxiso-2.03-Linux.deb" && sudo apt install ./mkpsxiso-2.03-Linux.deb
- name: Making ARK-4
run: make
- name: Making DEBUG Version
run: |
make clean
make DEBUG=1
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*.deb
*.elf
*.o
*.PBP
*.prx
*.rpm
*.SFO
*.elf
Loading

0 comments on commit 15fea30

Please sign in to comment.