diff --git a/.github/workflows/buildarm64.yml b/.github/workflows/buildarm64.yml index 0669de2..9d05cf2 100644 --- a/.github/workflows/buildarm64.yml +++ b/.github/workflows/buildarm64.yml @@ -81,24 +81,16 @@ jobs: fi chmod -R 777 ./ mkdir -p download - ./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 }} + ./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 - name: Prepare release tag 🏷️ id: releasetag run: | - if [[ "${{ inputs.release_type }}" == "WIF" ]]; then - 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" - echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV - echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV - echo "WSA_VER=$currentver" >> $GITHUB_ENV - else - 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" - echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV - echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV - echo "WSA_VER=$currentver" >> $GITHUB_ENV - fi + currentver=${{ inputs.wsa_ver }} + folderpath="/WSABuilds/Builds/Windows Subsystem For Android™ v$currentver/Windows 11/Windows 11 arm64" + echo "DRIVE_FOLDER_PATH=$folderpath" >> $GITHUB_ENV + echo "WSA_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV + echo "WSA_VER=$currentver" >> $GITHUB_ENV - name: Check GitHub ENV variables run: | @@ -174,19 +166,7 @@ jobs: - name: File Checksum for Windows 11 arm64 Build✔️ id: run - run: ("hash=" + $(Get-FileHash -Path ${{ needs.build.outputs.zipname }}.7z -Algorithm SHA256).Hash.ToLower().ToString()) | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding UTF8 -Append - - - name: Setup rclone 🎚️ - uses: AnimMouse/setup-rclone@v1.9.0 - with: - rclone_config: ${{ secrets.RCLONE_CONFIG }} - - - name: Upload build to OneDrive for Windows 11 arm64 Build⏫ - run: | - echo ${{ needs.build.outputs.onedrivepath }} - rclone copy ${{ needs.build.outputs.zipname }}.7z OneDrive:"${{ needs.build.outputs.onedrivepath }}" --create-empty-src-dirs - env: - RCLONE_CONFIG_PASS: ${{ secrets.RCLONE_CONFIG_PASS }} + run: ("hash=" + $(Get-FileHash -Path ${{ needs.build.outputs.zipname }}.7z -Algorithm SHA256).Hash.ToLower().ToString()) | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding UTF8 -Append) - name: Upload Windows 11 arm64 build to release 🤌 uses: softprops/action-gh-release@v2