Mirrors/WSABuilds
2
0
Fork 0
mirror of https://github.com/MustardChef/WSABuilds.git synced 2024-11-14 07:35:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Issues with Workflow

Browse Source
This commit is contained in:
MCDeltaT 2023-12-15 01:28:36 +00:00
parent c63691d0bb
commit c52322ebbc
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -87,7 +87,7 @@ jobs:
id: releasetag id: releasetag
run: | run: |
if [[ "${{ inputs.release_type }}" == "WIF" ]]; then if [[ "${{ inputs.release_type }}" == "WIF" ]]; then
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/test1.0/update/WIF.appversion) currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/WIF.appversion)
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64" folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64"
folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/" folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/"
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
@ -96,7 +96,7 @@ jobs:
echo "WSA_TAG_WIN10=Windows_10_$currentver" >> $GITHUB_ENV echo "WSA_TAG_WIN10=Windows_10_$currentver" >> $GITHUB_ENV
echo "WSA_VER=$currentver" >> $GITHUB_ENV echo "WSA_VER=$currentver" >> $GITHUB_ENV
else else
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/test1.0/update/retail.appversion) currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/retail.appversion)
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64" folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64"
folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/" folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/"
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV

4
.github/workflows/buildarm64.yml vendored
View File

@ -87,13 +87,13 @@ jobs:
id: releasetag id: releasetag
run: | run: |
if [[ "${{ inputs.release_type }}" == "WIF" ]]; then if [[ "${{ inputs.release_type }}" == "WIF" ]]; then
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/test1.0/update/WIF.appversion) currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/WIF.appversion)
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 arm64" folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 arm64"
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV
echo "WSA_VER=$currentver" >> $GITHUB_ENV echo "WSA_VER=$currentver" >> $GITHUB_ENV
else else
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/test1.0/update/retail.appversion) currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/retail.appversion)
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 arm64" folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 arm64"
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV

18
.github/workflows/update.yml vendored
View File

@ -30,32 +30,32 @@ jobs:
- name: Check WSA Insider Version ✅ - name: Check WSA Insider Version ✅
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/WSAInsiderUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/WSAInsiderUpdateCheck.py
python3 WSAInsiderUpdateCheck.py python3 WSAInsiderUpdateCheck.py
- name: Check WSA Retail Version ☑️ - name: Check WSA Retail Version ☑️
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/WSARetailUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/WSARetailUpdateCheck.py
python3 WSARetailUpdateCheck.py python3 WSARetailUpdateCheck.py
- name: Check Magisk Stable Version ✅ - name: Check Magisk Stable Version ✅
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/MagiskStableUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/MagiskStableUpdateCheck.py
python3 MagiskStableUpdateCheck.py python3 MagiskStableUpdateCheck.py
- name: Check Magisk Canary Version ☑️ - name: Check Magisk Canary Version ☑️
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/MagiskCanaryUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/MagiskCanaryUpdateCheck.py
python3 MagiskCanaryUpdateCheck.py python3 MagiskCanaryUpdateCheck.py
- name: Check KernelSU Version ✅ - name: Check KernelSU Version ✅
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/KernelSUUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/KernelSUUpdateCheck.py
python3 KernelSUUpdateCheck.py python3 KernelSUUpdateCheck.py
- name: Check MindTheGapps Version ☑️ - name: Check MindTheGapps Version ☑️
run: | run: |
wget https://github.com/MustardChef/test1.0/raw/main/MagiskOnWSA/Update%20Check/MTGUpdateCheck.py wget https://github.com/MustardChef/WSABuilds/raw/main/MagiskOnWSA/Update%20Check/MTGUpdateCheck.py
python3 MTGUpdateCheck.py python3 MTGUpdateCheck.py
- name: Check GitHub ENVs - name: Check GitHub ENVs
@ -257,7 +257,7 @@ jobs:
id: checkTag1 id: checkTag1
with: with:
tag: ${{ env.WIN11X64_TAG }} tag: ${{ env.WIN11X64_TAG }}
repo: 'MustardChef/test1.0' repo: 'MustardChef/WSABuilds'
- run: echo ${{ steps.checkTag1.outputs.exists }} - run: echo ${{ steps.checkTag1.outputs.exists }}
- name: Stop workflow if tag exists - name: Stop workflow if tag exists
@ -269,7 +269,7 @@ jobs:
id: checkTag2 id: checkTag2
with: with:
tag: ${{ env.WIN11ARM64_TAG }} tag: ${{ env.WIN11ARM64_TAG }}
repo: 'MustardChef/test1.0' repo: 'MustardChef/WSABuilds'
- run: echo ${{ steps.checkTag.outputs.exists }} - run: echo ${{ steps.checkTag.outputs.exists }}
- name: Stop workflow if tag exists - name: Stop workflow if tag exists
@ -281,7 +281,7 @@ jobs:
id: checkTag3 id: checkTag3
with: with:
tag: ${{ env.WIN10X64_TAG }} tag: ${{ env.WIN10X64_TAG }}
repo: 'MustardChef/test1.0' repo: 'MustardChef/WSABuilds'
- run: echo ${{ steps.checkTag.outputs.exists }} - run: echo ${{ steps.checkTag.outputs.exists }}
- name: Stop workflow if tag exists - name: Stop workflow if tag exists

2
MagiskOnWSA/Update Check/KernelSUUpdateCheck.py
View File

@ -6,7 +6,7 @@ import subprocess
logging.captureWarnings(True) logging.captureWarnings(True)
env_file = os.getenv('GITHUB_ENV') env_file = os.getenv('GITHUB_ENV')
new_version_found = False new_version_found = False
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/kernelsu.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/kernelsu.appversion").text.replace('\n', '')
git = ( git = (
"git checkout -f update || git switch --discard-changes --orphan update" "git checkout -f update || git switch --discard-changes --orphan update"
) )

2
MagiskOnWSA/Update Check/MTGUpdateCheck.py
View File

@ -6,7 +6,7 @@ import subprocess
logging.captureWarnings(True) logging.captureWarnings(True)
env_file = os.getenv('GITHUB_ENV') env_file = os.getenv('GITHUB_ENV')
new_version_found = False new_version_found = False
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/gapps.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/gapps.appversion").text.replace('\n', '')
git = ( git = (
"git checkout -f update || git switch --discard-changes --orphan update" "git checkout -f update || git switch --discard-changes --orphan update"
) )

2
MagiskOnWSA/Update Check/MagiskCanaryUpdateCheck.py
View File

@ -6,7 +6,7 @@ import subprocess
logging.captureWarnings(True) logging.captureWarnings(True)
env_file = os.getenv('GITHUB_ENV') env_file = os.getenv('GITHUB_ENV')
new_version_found = False new_version_found = False
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/magiskcanary.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/magiskcanary.appversion").text.replace('\n', '')
git = ( git = (
"git checkout -f update || git switch --discard-changes --orphan update" "git checkout -f update || git switch --discard-changes --orphan update"
) )

2
MagiskOnWSA/Update Check/MagiskStableUpdateCheck.py
View File

@ -9,7 +9,7 @@ new_version_found = False
git = ( git = (
"git checkout -f update || git switch --discard-changes --orphan update" "git checkout -f update || git switch --discard-changes --orphan update"
) )
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/magiskstable.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/magiskstable.appversion").text.replace('\n', '')
with open('magiskstable.appversion', 'w') as file: with open('magiskstable.appversion', 'w') as file:
file.write(currentver) file.write(currentver)
if not new_version_found: if not new_version_found:

8
MagiskOnWSA/Update Check/WSAInsiderUpdateCheck.py
View File

@ -66,10 +66,10 @@ except:
users = {"", user_code} users = {"", user_code}
# The code inside the function WSAInsiderUpdateChecker starts here # The code inside the function WSAInsiderUpdateChecker starts here
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/WIF.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/WIF.appversion").text.replace('\n', '')
print("Current working directory:", os.getcwd()) print("Current working directory:", os.getcwd())
print("Files in '/home/runner/work/test1.0/test1.0/MagiskOnWSALocal2/xml':", os.listdir('/home/runner/work/test1.0/test1.0/MagiskOnWSALocal2/xml')) print("Files in '/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal2/xml':", os.listdir('/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal2/xml'))
# Write for pushing later # Write for pushing later
try: try:
@ -83,7 +83,7 @@ except Exception as e:
if not new_version_found: if not new_version_found:
# Get information # Get information
with open("/home/runner/work/test1.0/test1.0/MagiskOnWSALocal2/xml/GetCookie.xml", "r") as f: with open("/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal2/xml/GetCookie.xml", "r") as f:
cookie_content = f.read().format(user_code) cookie_content = f.read().format(user_code)
try: try:
out = session.post( out = session.post(
@ -96,7 +96,7 @@ if not new_version_found:
exit(1) exit(1)
doc = minidom.parseString(out.text) doc = minidom.parseString(out.text)
cookie = doc.getElementsByTagName('EncryptedData')[0].firstChild.nodeValue cookie = doc.getElementsByTagName('EncryptedData')[0].firstChild.nodeValue
with open("/home/runner/work/test1.0/test1.0/MagiskOnWSALocal2/xml/WUIDRequest.xml", "r") as f: with open("/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal2/xml/WUIDRequest.xml", "r") as f:
cat_id_content = f.read().format(user_code, cookie, cat_id, release_type) cat_id_content = f.read().format(user_code, cookie, cat_id, release_type)
try: try:
out = session.post( out = session.post(

8
MagiskOnWSA/Update Check/WSARetailUpdateCheck.py
View File

@ -50,9 +50,9 @@ user_code = ""
users = {""} users = {""}
print("Current working directory:", os.getcwd()) print("Current working directory:", os.getcwd())
print("Files in '/home/runner/work/test1.0/test1.0/MagiskOnWSALocal1/xml':", os.listdir('/home/runner/work/test1.0/test1.0/MagiskOnWSALocal1/xml')) print("Files in '/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal1/xml':", os.listdir('/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal1/xml'))
currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/test1.0/update/retail.appversion").text.replace('\n', '') currentver = requests.get(f"https://raw.githubusercontent.com/MustardChef/WSABuilds/update/retail.appversion").text.replace('\n', '')
# Write for pushing later # Write for pushing later
try: try:
@ -66,7 +66,7 @@ except Exception as e:
if not new_version_found: if not new_version_found:
# Get information # Get information
with open("/home/runner/work/test1.0/test1.0/MagiskOnWSALocal1/xml/GetCookie.xml", "r") as f: with open("/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal1/xml/GetCookie.xml", "r") as f:
cookie_content = f.read().format(user_code) cookie_content = f.read().format(user_code)
try: try:
out = session.post( out = session.post(
@ -79,7 +79,7 @@ if not new_version_found:
exit(1) exit(1)
doc = minidom.parseString(out.text) doc = minidom.parseString(out.text)
cookie = doc.getElementsByTagName('EncryptedData')[0].firstChild.nodeValue cookie = doc.getElementsByTagName('EncryptedData')[0].firstChild.nodeValue
with open("/home/runner/work/test1.0/test1.0/MagiskOnWSALocal1/xml/WUIDRequest.xml", "r") as f: with open("/home/runner/work/WSABuilds/WSABuilds/MagiskOnWSALocal1/xml/WUIDRequest.xml", "r") as f:
cat_id_content = f.read().format(user_code, cookie, cat_id, release_type) cat_id_content = f.read().format(user_code, cookie, cat_id, release_type)
try: try:
out = session.post( out = session.post(