Skip to content

Commit 8c75bb8

Browse files
Update build.yml
1 parent 40f84cb commit 8c75bb8

File tree

1 file changed

+26
-37
lines changed

1 file changed

+26
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,19 @@ jobs:
8181
fi
8282
chmod -R 777 ./
8383
mkdir -p download
84-
./scripts/build.sh --arch ${{ inputs.arch }} --release-type $RLS_TYPE --magisk-ver ${{ inputs.magiskver }} --gapps-brand ${{ inputs.gapps }} --root-sol ${{ inputs.root }} --custom-model ${{ inputs.devicemodel }} ${{ inputs.amazonflag }} --compress-format ${{ inputs.compressformat }}
84+
./scripts/build.sh --arch ${{ inputs.arch }} --release-type WIF --magisk-branch topjohnwu --magisk-ver ${{ inputs.magiskver }} --gapps-brand ${{ inputs.gapps }} --root-sol ${{ inputs.root }} --custom-model redfin ${{ inputs.amazonflag }} --compress-format zip
8585
8686
- name: Prepare release tag 🏷️
8787
id: releasetag
8888
run: |
89-
if [[ "${{ inputs.release_type }}" == "WIF" ]]; then
90-
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/WIF.appversion)
91-
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64"
92-
folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/"
93-
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
94-
echo "DRIVE_FOLDER_PATH_WIN10=$folderpathwin10" >> $GITHUB_ENV
95-
echo "WSA_TAG=Windows_11_$currentver" >> $GITHUB_ENV
96-
echo "WSA_TAG_WIN10=Windows_10_$currentver" >> $GITHUB_ENV
97-
echo "WSA_VER=$currentver" >> $GITHUB_ENV
98-
else
99-
currentver=$(curl -s https://raw.githubusercontent.com/MustardChef/WSABuilds/update/retail.appversion)
100-
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64"
101-
folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/"
102-
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
103-
echo "DRIVE_FOLDER_PATH_WIN10=$folderpathwin10" >> $GITHUB_ENV
104-
echo "WSA_TAG=Windows_11_$currentver" >> $GITHUB_ENV
105-
echo "WSA_TAG_WIN10=Windows_10_$currentver" >> $GITHUB_ENV
106-
echo "WSA_VER=$currentver" >> $GITHUB_ENV
107-
fi
89+
currentver=${{ inputs.wsa_ver }}
90+
folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 x86_64"
91+
folderpathwin10="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 10/"
92+
echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV
93+
echo "DRIVE_FOLDER_PATH_WIN10=$folderpathwin10" >> $GITHUB_ENV
94+
echo "WSA_TAG=Windows_11_$currentver" >> $GITHUB_ENV
95+
echo "WSA_TAG_WIN10=Windows_10_$currentver" >> $GITHUB_ENV
96+
echo "WSA_VER=$currentver" >> $GITHUB_ENV
10897
10998
- name: Check GitHub ENV variables
11099
run: |
@@ -186,17 +175,17 @@ jobs:
186175
id: run
187176
run: ("hash=" + $(Get-FileHash -Path ${{ needs.build.outputs.zipname }}.7z -Algorithm SHA256).Hash.ToLower().ToString()) | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding UTF8 -Append
188177

189-
- name: Setup rclone 🎚️
190-
uses: AnimMouse/setup-rclone@v1.9.0
191-
with:
192-
rclone_config: ${{ secrets.RCLONE_CONFIG }}
193-
194-
- name: Upload build to OneDrive for Windows 11 x64 Build⏫
195-
run: |
196-
echo ${{ needs.build.outputs.onedrivepath }}
197-
rclone copy ${{ needs.build.outputs.zipname }}.7z OneDrive:"${{ needs.build.outputs.onedrivepath }}" --create-empty-src-dirs
198-
env:
199-
RCLONE_CONFIG_PASS: ${{ secrets.RCLONE_CONFIG_PASS }}
178+
# - name: Setup rclone 🎚️
179+
# uses: AnimMouse/setup-rclone@v1.9.0
180+
# with:
181+
# rclone_config: ${{ secrets.RCLONE_CONFIG }}
182+
#
183+
# - name: Upload build to OneDrive for Windows 11 x64 Build⏫
184+
# run: |
185+
# echo ${{ needs.build.outputs.onedrivepath }}
186+
# rclone copy ${{ needs.build.outputs.zipname }}.7z OneDrive:"${{ needs.build.outputs.onedrivepath }}" --create-empty-src-dirs
187+
# env:
188+
# RCLONE_CONFIG_PASS: ${{ secrets.RCLONE_CONFIG_PASS }}
200189

201190
- name: Upload Windows 11 x64 build to release 🤌
202191
uses: softprops/action-gh-release@v2
@@ -241,12 +230,12 @@ jobs:
241230
id: run2
242231
run: ("hash=" + $(Get-FileHash -Path "${{ needs.build.outputs.zipname }}_Windows_10.7z" -Algorithm SHA256).Hash.ToLower().ToString()) | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding UTF8 -Append
243232

244-
- name: Upload build to OneDrive for Windows 10 x64 Build⏫
245-
run: |
246-
echo ${{ needs.build.outputs.onedrivepathwin10 }}
247-
rclone copy ${{ needs.build.outputs.zipname }}_Windows_10.7z OneDrive:"${{ needs.build.outputs.onedrivepathwin10 }}" --create-empty-src-dirs
248-
env:
249-
RCLONE_CONFIG_PASS: ${{ secrets.RCLONE_CONFIG_PASS }}
233+
# - name: Upload build to OneDrive for Windows 10 x64 Build⏫
234+
# run: |
235+
# echo ${{ needs.build.outputs.onedrivepathwin10 }}
236+
# rclone copy ${{ needs.build.outputs.zipname }}_Windows_10.7z OneDrive:"${{ needs.build.outputs.onedrivepathwin10 }}" --create-empty-src-dirs
237+
# env:
238+
# RCLONE_CONFIG_PASS: ${{ secrets.RCLONE_CONFIG_PASS }}
250239

251240
- name: Upload Windows 10 x64 build to release 🤌
252241
uses: softprops/action-gh-release@v2

0 commit comments

Comments
 (0)