diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index c8e33a0..8222e24 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -26,16 +26,6 @@ jobs:
- name: Check Directories and Sub-Directories ☑️
run: tree
- - name: Check WSA Insider Version ✅
- run: |
- wget https://github.com/MustardChef/WSABuilds/raw/master/MagiskOnWSA/Update%20Check/WSAInsiderUpdateCheck.py
- python3 WSAInsiderUpdateCheck.py
-
- - name: Check WSA Retail Version ☑️
- run: |
- wget https://github.com/MustardChef/WSABuilds/raw/master/MagiskOnWSA/Update%20Check/WSARetailUpdateCheck.py
- python3 WSARetailUpdateCheck.py
-
- name: Check Magisk Stable Version ✅
run: |
wget https://github.com/MustardChef/WSABuilds/raw/master/MagiskOnWSA/Update%20Check/MagiskStableUpdateCheck.py
@@ -58,19 +48,11 @@ jobs:
- name: Check GitHub ENVs
run: |
- echo Should Build Execute: ${{ env.SHOULD_BUILD }}
- echo Release Type: ${{ env.RELEASE_TYPE }}
- echo WSA Update Message: ${{ env.MSG }}
- echo Latest WIF Version: ${{ env.LATEST_WIF_VER }}
- echo Latest Retail Version: ${{ env.LATEST_RETAIL_VER }}
- echo Insider Update?: ${{ env.INSIDER_UPDATE }}
- echo Retail Update?: ${{ env.RETAIL_UPDATE }}
echo Magisk Canary Update Message: ${{ env.MAGISK_CANARY_MSG }}
echo Magisk Stable Update Message: ${{ env.MAGISK_STABLE_MSG }}
echo KernelSU Update Message: ${{ env.KERNEL_SU_MSG }}
echo MTG Update Message: ${{ env.MTG_MSG }}
-
- name: Update App version 🔗
uses: stefanzweifel/git-auto-commit-action@v5.0.0
with:
@@ -91,23 +73,16 @@ jobs:
- name: Checkout Again! 🔄
uses: actions/checkout@v4
-
+
outputs:
- SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
- RELEASE_TYPE: ${{ env.RELEASE_TYPE }}
- WSA_UPDATE_MESSAGE: ${{ env.MSG }}
- LATEST_WIF_VER: ${{ env.LATEST_WIF_VER }}
- LATEST_RETAIL_VER: ${{ env.LATEST_RETAIL_VER }}
MAGISK_CANARY_MSG: ${{ env.MAGISK_CANARY_MSG }}
MAGISK_STABLE_MSG: ${{ env.MAGISK_STABLE_MSG }}
KERNEL_SU_MSG: ${{ env.KERNEL_SU_MSG }}
MTG_MSG: ${{ env.MTG_MSG }}
-
+
update-downloadlinks:
name: Update Download Links
- needs: [check]
- if: needs.check.outputs.SHOULD_BUILD == 'yes'
runs-on: ubuntu-latest
steps:
- name: Checkout 🔄
@@ -128,34 +103,47 @@ jobs:
- name: Check Release type and get latest version and row/column numbers
run: |
- if [[ "${{ needs.check.outputs.RELEASE_TYPE }}" == "WIF" ]]; then
- verofwsa=${{ needs.check.outputs.LATEST_WIF_VER }}
- win11x64_link="
"
- win11arm64_link="
"
- win10x64_link="
"
- else
- verofwsa=${{ needs.check.outputs.LATEST_RETAIL_VER }}
- win11x64_link="
"
- win11arm64_link="
"
- win10x64_link="
"
- fi
+ verofwsa=${{ inputs.wsa_ver }}
+ win11x64_link="
"
+ win11arm64_link="
"
+ win10x64_link="
"
+ win11x64_link_retail="
"
+ win11arm64_link_retail="
"
+ win10x64_link_retailk="
"
echo "LINK_FOR_W11X64=$win11x64_link" >> $GITHUB_ENV
echo "LINK_FOR_W11ARM64=$win11arm64_link" >> $GITHUB_ENV
echo "LINK_FOR_W10X64=$win10x64_link" >> $GITHUB_ENV
echo "LATEST_VER=$verofwsa" >> $GITHUB_ENV
+ echo "LINK_FOR_W11X64_RETAIL=$win11x64_link_retail" >> $GITHUB_ENV
+ echo "LINK_FOR_W11ARM64_RETAIL=$win11arm64_link_retail" >> $GITHUB_ENV
+ echo "LINK_FOR_W10X64_RETAIL=$win10x64_link_retail" >> $GITHUB_ENV
+
- name: Print environment variables
run: |
+ echo "LINK_FOR_W11X64_RETAIL=$LINK_FOR_W11X64_RETAIL"
+ echo "LINK_FOR_W11ARM64_RETAIL=$LINK_FOR_W11ARM64_RETAIL"
+ echo "LINK_FOR_W10X64_RETAIL=$LINK_FOR_W10X64_RETAIL"
echo "LINK_FOR_W11X64=$LINK_FOR_W11X64"
echo "LINK_FOR_W11ARM64=$LINK_FOR_W11ARM64"
echo "LINK_FOR_W10X64=$LINK_FOR_W10X64"
- echo "LATEST_VER=$LATEST_VER"
+ echo "LATEST_VER_RETAIL=$LATEST_VER"
+
- name: Replace Link in README.md for Download Links Table for the WSA ${{ env.LATEST_VER }} update
run: python "./MagiskOnWSA/Update Check/update-downloadlinks.py"
env:
LINK_FOR_W11X64: ${{ env.LINK_FOR_W11X64 }}
LINK_FOR_W11ARM64: ${{ env.LINK_FOR_W11ARM64 }}
LINK_FOR_W10X64: ${{ env.LINK_FOR_W10X64 }}
- RELEASE_TYPE: ${{ needs.check.outputs.RELEASE_TYPE }}
+ RELEASE_TYPE: "WIF"
+ LATEST_VER: ${{ env.LATEST_VER }}
+
+ - name: Replace Link in README.md for Download Links Table for the WSA ${{ env.LATEST_VER }} update
+ run: python "./MagiskOnWSA/Update Check/update-downloadlinks.py"
+ env:
+ LINK_FOR_W11X64: ${{ env.LINK_FOR_W11X64_RETAIL }}
+ LINK_FOR_W11ARM64: ${{ env.LINK_FOR_W11ARM64_RETAIL }}
+ LINK_FOR_W10X64: ${{ env.LINK_FOR_W10X64_RETAIL }}
+ RELEASE_TYPE: "retail"
LATEST_VER: ${{ env.LATEST_VER }}
- name: Commit and push if it changed
@@ -167,78 +155,9 @@ jobs:
git pull --rebase origin master
git push
- update-downloadvartable:
- name: Update Download Variant Table
- runs-on: ubuntu-latest
- needs: [check, update-downloadlinks]
- if: needs.check.outputs.SHOULD_BUILD == 'yes'
- steps:
- - name: Checkout 🔄
- uses: actions/checkout@v4
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Checkout code
- uses: actions/checkout@v4
-
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.12'
-
- - name: Install dependencies
- run: pip install beautifulsoup4 PyGithub
-
- - name: Check Release type and get latest version and row/column numbers
- run: |
- if [[ "${{ needs.check.outputs.RELEASE_TYPE }}" == "WIF" ]]; then
- verofwsa=${{ needs.check.outputs.LATEST_WIF_VER }}
- row_num=3
- column_num=1
- row_num_fordate=4
- column_num_fordate=1
- else
- verofwsa=${{ needs.check.outputs.LATEST_RETAIL_VER }}
- row_num=3
- column_num=2
- row_num_fordate=4
- column_num_fordate=2
- fi
- echo "ROW_NUMBER=$row_num" >> $GITHUB_ENV
- echo "COLUMN_NUMBER=$column_num" >> $GITHUB_ENV
- echo "ROW_NUMBER_FOR_DATE=$row_num_fordate" >> $GITHUB_ENV
- echo "COLUMN_NUMBER_FOR_DATE=$column_num_fordate" >> $GITHUB_ENV
- echo "CURRENT_DATE=$(date -u +'%d/%m/%Y')" >> $GITHUB_ENV
- echo "LATEST_VER=$verofwsa" >> $GITHUB_ENV
-
- - name: Replace version in README.md for Download Variant Table
- run: python "./MagiskOnWSA/Update Check/update-downloadvar.py"
- env:
- ROW_NUM: ${{ env.ROW_NUMBER }}
- COLUMN_NUM: ${{ env.COLUMN_NUMBER }}
- TEXT_TO_REPLACE_WITH: ${{ env.LATEST_VER }}
-
- - name: Replace Date in README.md for Download Variant Table
- run: python "./MagiskOnWSA/Update Check/update-downloadvar.py"
- env:
- ROW_NUM: ${{ env.ROW_NUMBER_FOR_DATE }}
- COLUMN_NUM: ${{ env.COLUMN_NUMBER_FOR_DATE }}
- TEXT_TO_REPLACE_WITH: ${{ env.CURRENT_DATE }}
-
- - name: Commit and push if it changed
- run: |
- git diff
- git config --global user.email "68516357+MustardChef@users.noreply.github.com"
- git config --global user.name "MustardChef"
- git commit -am "Update Download Variant Table for Update: ${{ env.LATEST_VER }}" || exit 0
- git pull --rebase origin master
- git push
-
-
check-and-create-tag:
name: Creates the release tags
- needs: [check, update-downloadlinks, update-downloadvartable]
- if: needs.check.outputs.SHOULD_BUILD == 'yes'
+ needs: [check, update-downloadlinks]
runs-on: ubuntu-latest
steps:
- name: Checkout 🔄
@@ -248,15 +167,7 @@ jobs:
id: releasetag
shell: bash
run: |
- if [[ "${{ needs.check.outputs.RELEASE_TYPE }}" == "WIF" ]]; then
- currentver=${{ needs.check.outputs.LATEST_WIF_VER }}
- elif [[ "${{ needs.check.outputs.RELEASE_TYPE }}" == "retail" ]]; then
- currentver=${{ needs.check.outputs.LATEST_RETAIL_VER }}
- fi
- if [[ -z "$currentver" ]]; then
- echo "currentver is empty. Please check the file contents."
- exit 1
- fi
+ currentver=${{ inputs.wsa_ver }}
echo "WSA_VER=$currentver" >> $GITHUB_ENV
echo "WIN11X64_TAG=Windows_11_$currentver" >> $GITHUB_ENV
echo "WIN11ARM64_TAG=Windows_11_${currentver}_arm64" >> $GITHUB_ENV
@@ -322,7 +233,6 @@ jobs:
file_data = re.sub('<>', date, file_data)
file_data = re.sub('<>', time, file_data)
file_data = re.sub('<>', 'Initial Release', file_data)
- file_data = re.sub('<>', custom_escape(os.environ['WSA_UPDATE_MESSAGE']), file_data)
file_data = re.sub('<>', 'Android 13', file_data)
file_data = re.sub('<>', custom_escape(os.environ['MTG_MSG']), file_data)
file_data = re.sub('<>', custom_escape(os.environ['MAGISK_CANARY_MSG']), file_data)
@@ -333,7 +243,6 @@ jobs:
shell: python
env:
GITHUB_WORKSPACE: ${{ github.workspace }}
- WSA_UPDATE_MESSAGE: ${{ needs.check.outputs.WSA_UPDATE_MESSAGE }}
MTG_MSG: ${{ needs.check.outputs.MTG_MSG }}
MAGISK_CANARY_MSG: ${{ needs.check.outputs.MAGISK_CANARY_MSG }}
MAGISK_STABLE_MSG: ${{ needs.check.outputs.MAGISK_STABLE_MSG }}
@@ -354,7 +263,6 @@ jobs:
file_data = re.sub('<>', date, file_data)
file_data = re.sub('<>', time, file_data)
file_data = re.sub('<>', 'Initial Release', file_data)
- file_data = re.sub('<>', custom_escape(os.environ['WSA_UPDATE_MESSAGE']), file_data)
file_data = re.sub('<>', 'Android 13', file_data)
file_data = re.sub('<>', custom_escape(os.environ['MTG_MSG']), file_data)
file_data = re.sub('<>', custom_escape(os.environ['MAGISK_CANARY_MSG']), file_data)
@@ -365,7 +273,6 @@ jobs:
shell: python
env:
GITHUB_WORKSPACE: ${{ github.workspace }}
- WSA_UPDATE_MESSAGE: ${{ needs.check.outputs.WSA_UPDATE_MESSAGE }}
MTG_MSG: ${{ needs.check.outputs.MTG_MSG }}
MAGISK_CANARY_MSG: ${{ needs.check.outputs.MAGISK_CANARY_MSG }}
MAGISK_STABLE_MSG: ${{ needs.check.outputs.MAGISK_STABLE_MSG }}
@@ -386,7 +293,6 @@ jobs:
file_data = re.sub('<>', date, file_data)
file_data = re.sub('<>', time, file_data)
file_data = re.sub('<>', 'Initial Release', file_data)
- file_data = re.sub('<>', custom_escape(os.environ['WSA_UPDATE_MESSAGE']), file_data)
file_data = re.sub('<>', 'Android 13', file_data)
file_data = re.sub('<>', custom_escape(os.environ['MTG_MSG']), file_data)
file_data = re.sub('<>', custom_escape(os.environ['MAGISK_CANARY_MSG']), file_data)
@@ -397,7 +303,6 @@ jobs:
shell: python
env:
GITHUB_WORKSPACE: ${{ github.workspace }}
- WSA_UPDATE_MESSAGE: ${{ needs.check.outputs.WSA_UPDATE_MESSAGE }}
MTG_MSG: ${{ needs.check.outputs.MTG_MSG }}
MAGISK_CANARY_MSG: ${{ needs.check.outputs.MAGISK_CANARY_MSG }}
MAGISK_STABLE_MSG: ${{ needs.check.outputs.MAGISK_STABLE_MSG }}
@@ -436,7 +341,7 @@ jobs:
build_x64_no_root_gapps_remove_amazon_redfin:
name: Build for x64 as Redfin with No Root, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -453,14 +358,14 @@ jobs:
build_x64_no_root_gapps_redfin:
name: Build for x64 as Redfin with No Root, GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: x64
root: none
gapps: MindTheGapps
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -470,7 +375,7 @@ jobs:
build_x64_no_root_no_gapps_remove_amazon_redfin:
name: Build for x64 as Redfin with No Root, No GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -487,14 +392,14 @@ jobs:
build_x64_no_root_no_gapps_redfin:
name: Build for x64 as Redfin with No Root, No GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: x64
root: none
gapps: none
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -504,7 +409,7 @@ jobs:
build_x64_kernelsu_gapps_remove_amazon_redfin:
name: Build for x64 as Redfin with KernelSU, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -521,14 +426,14 @@ jobs:
build_x64_magisk_gapps_redfin:
name: Build for x64 as Redfin with Magisk, GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: x64
root: magisk
gapps: MindTheGapps
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -538,7 +443,7 @@ jobs:
build_x64_magisk_no_gapps_remove_amazon_redfin:
name: Build for x64 as Redfin with Magisk, No GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -555,7 +460,7 @@ jobs:
build_x64_magisk_canary_gapps_remove_amazon_redfin:
name: Build for x64 as Redfin with Magisk Canary, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/build.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -572,7 +477,7 @@ jobs:
build_arm64_no_root_gapps_remove_amazon_redfin:
name: Build for arm64 as Redfin with No Root, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -589,14 +494,14 @@ jobs:
build_arm64_no_root_gapps_redfin:
name: Build for arm64 as Redfin with No Root, GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: arm64
root: none
gapps: MindTheGapps
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -606,7 +511,7 @@ jobs:
build_arm64_no_root_no_gapps_remove_amazon_redfin:
name: Build for arm64 as Redfin with No Root, No GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -623,14 +528,14 @@ jobs:
build_arm64_no_root_no_gapps_redfin:
name: Build for arm64 as Redfin with No Root, No GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: arm64
root: none
gapps: none
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -640,7 +545,7 @@ jobs:
build_arm64_kernelsu_gapps_remove_amazon_redfin:
name: Build for arm64 as Redfin with KernelSU, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -657,14 +562,14 @@ jobs:
build_arm64_magisk_gapps_redfin:
name: Build for arm64 as Redfin with Magisk, GApps
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
arch: arm64
root: magisk
gapps: MindTheGapps
- amazonflag:
+ amazonflag: ""
magiskver: stable
devicemodel: redfin
compressformat: zip
@@ -674,7 +579,7 @@ jobs:
build_arm64_magisk_no_gapps_remove_amazon_redfin:
name: Build for arm64 as Redfin with Magisk, No GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -691,7 +596,7 @@ jobs:
build_arm64_magisk_canary_gapps_remove_amazon_redfin:
name: Build for arm64 as Redfin with Magisk Canary, GApps and No Amazon Appstore
permissions: write-all
- needs: [check, check-and-create-tag, update-downloadlinks, update-downloadvartable]
+ needs: [check, check-and-create-tag, update-downloadlinks]
uses: ./.github/workflows/buildarm64.yml
if: needs.check.outputs.SHOULD_BUILD == 'yes'
with:
@@ -706,4 +611,4 @@ jobs:
secrets: inherit
-
\ No newline at end of file
+