Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor, fixes and actions update #60

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
3b79b49
Move stuff into functions
Francommit May 13, 2024
63f6b6f
Apparently path can't be used within a function?
Francommit May 13, 2024
9901272
Debug a bit
Francommit May 13, 2024
1ddb367
Add initial vars
Francommit May 13, 2024
0ced35c
More debug
Francommit May 13, 2024
46ddf50
I thought this didn't matter
Francommit May 13, 2024
a1e4dfe
Test weird script thing I've never heard of
Francommit May 13, 2024
9d40a4c
Revert "Test weird script thing I've never heard of"
Francommit May 13, 2024
e3df8d5
I don't think I've ever used globals
Francommit May 13, 2024
d1feb34
Really unsure
Francommit May 13, 2024
d069483
Make ide shut it
Francommit May 13, 2024
01aa87e
This is honestly really weird
Francommit May 13, 2024
6cb77f2
Well there you go
Francommit May 13, 2024
cd0320c
Install winrar
Francommit May 13, 2024
83bf759
Try winrar instead of 7zip
Francommit May 14, 2024
7f531d5
Copy the right folder
Francommit May 14, 2024
58379a1
debugging folders
Francommit May 14, 2024
e056592
Verbose winrar
Francommit May 14, 2024
9284af5
check winrar path
Francommit May 14, 2024
5e36a1e
Use rar instead of winrar
Francommit May 14, 2024
a23122b
Change extraction to suit rar.exe
Francommit May 14, 2024
fa8588e
Let's try a space
Francommit May 14, 2024
bbfc0f7
Adjust some things
Francommit May 14, 2024
c0caab4
Spit out the output
Francommit May 14, 2024
a9c7b70
update prepare.ps1
Francommit May 14, 2024
85d0383
update prepare.ps1
Francommit May 14, 2024
dac88b6
update prepare.ps1
Francommit May 14, 2024
fef9dc4
update prepare.ps1
Francommit May 14, 2024
f0f4284
update prepare.ps1
Francommit May 14, 2024
79dac94
update prepare.ps1
Francommit May 14, 2024
4d120d8
update prepare.ps1
Francommit May 14, 2024
eddc2d1
update prepare.ps1
Francommit May 14, 2024
d93bd32
Better logs
Francommit May 14, 2024
1d8e92c
update prepare.ps1
Francommit May 14, 2024
493b514
Make winrar more verbose
Francommit May 14, 2024
86f11e8
try make winrar verbose
Francommit May 14, 2024
e731ce4
update prepare.ps1
Francommit May 14, 2024
ae10552
update prepare.ps1
Francommit May 15, 2024
0c9440b
update prepare.ps1
Francommit May 15, 2024
3ed1245
update prepare.ps1
Francommit May 15, 2024
a5430c6
Back to 7zip
Francommit May 15, 2024
7693af9
Better logging
Francommit May 15, 2024
547e42a
try this
Francommit May 15, 2024
6f2c4f2
Clean up some stuff
Francommit May 15, 2024
5db5e20
Remove a bunch of logging
Francommit May 15, 2024
134d5e6
Minor fix
Francommit May 15, 2024
b89f748
Another minor fix
Francommit May 15, 2024
245b081
Put core code in function and minor refactor
Francommit May 15, 2024
ce24816
Globals for retroarch
Francommit May 15, 2024
e1c62ea
MORE GLOBALS
Francommit May 15, 2024
a7f778f
update prepare.ps1
Francommit May 15, 2024
a5faf99
Update prepare.ps1
Francommit May 15, 2024
a1ef8a0
Update prepare.ps1
Francommit May 15, 2024
6a266b6
update prepare.ps1
Francommit May 15, 2024
2992b6b
Update action.yml
Francommit May 15, 2024
c8d839f
Update prepare.ps1
Francommit May 16, 2024
a98f4e3
More functions
Francommit May 16, 2024
0613cdb
Rom path
Francommit May 16, 2024
8c4b58a
More functions
Francommit May 16, 2024
e4dc87b
Try a switch statement
Francommit May 16, 2024
2b3c5ec
Forgot script path
Francommit May 16, 2024
0830525
Better global use test
Francommit May 16, 2024
ce49867
Split up actions file
Francommit May 16, 2024
59d9f73
Clean up
Francommit May 16, 2024
07d55f7
Logic for crons or push events
Francommit May 16, 2024
f72d611
Bump version in one liner
Francommit May 16, 2024
e52b24e
Try scoop catching
Francommit May 17, 2024
5cf5aaa
Update prepare.ps1
Francommit May 17, 2024
c98dfd7
Fail harder
Francommit May 17, 2024
ecdd5b5
Update prepare.ps1
Francommit May 17, 2024
7cb18b4
Update prepare.ps1
Francommit May 17, 2024
5dbed61
Update prepare.ps1
Francommit May 17, 2024
f8e03da
Update prepare.ps1
Francommit May 17, 2024
7476f2e
Update prepare.ps1
Francommit May 17, 2024
350e76e
Update prepare.ps1
Francommit May 17, 2024
19477f3
Update prepare.ps1
Francommit May 17, 2024
6ca8246
Update prepare.ps1
Francommit May 17, 2024
63ad39d
correct ryjuinx name
Francommit May 17, 2024
8f900f9
try transparent logo
Francommit May 17, 2024
0d2d95d
Revert "try transparent logo"
Francommit May 17, 2024
3e49939
Remove transparency
Francommit May 17, 2024
1bb533d
Revert one liner
Francommit May 17, 2024
32f2690
Readme fix
Francommit May 17, 2024
b8b80cb
Merge branch 'dev' of https://github.com/Francommit/win10_emulation_s…
Francommit May 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
name: 'Build'
name: 'Run Script'

on:
push:
branches: [master, dev, test]
# schedule:
# - cron: "0 0 */2 * *"
branches:
- master
- dev
schedule:
- cron: "0 0 */2 * *"


jobs:

build:

runs-on: windows-latest

if: |
github.event_name == 'push' ||
(github.event_name == 'schedule' && github.ref == 'refs/heads/master')


steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install Dependencies
run: .\prepare.ps1 -installDependencies

- name: Acquire Files
run: .\prepare.ps1 -acquireFiles

- name: Powershell script runner
run: .\prepare.ps1
- name: Setup ROMs
run: .\prepare.ps1 -setupRoms
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ EmulationStation configured for Windows
An auto-installer to set up Emulation Station correctly on a 64-bit version of Windows 10/11


TO-DO: Test this once merged to master
```
if (-Not (Test-Path C:\temp\es-setup)) { mkdir C:\temp\es-setup }; Set-Location C:\temp\es-setup\;Set-ExecutionPolicy Bypass -Scope Process -Force;[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;Invoke-WebRequest "https://github.com/Francommit/win10_emulation_station/archive/master.zip" -OutFile "emulationStation.zip";Expand-Archive .\emulationStation.zip;cd .\emulationStation; cd .\win*;.\prepare.ps1
```

Features
------
- Uses an up to date version of Emulation Station from the Raspberry Pi branch
Expand Down
Binary file modified icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading