use matrix instead of workflow_dispatch inputs (#4)

This commit is contained in:
zhongfly 2021-10-26 19:21:40 +08:00 committed by GitHub
parent e693655c46
commit dde55916d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions

View File

@ -6,14 +6,13 @@ on:
magisk_apk: magisk_apk:
description: 'Download link to magisk apk.' description: 'Download link to magisk apk.'
required: true required: true
arch:
description: 'Architecture to build. Should be x64 or arm64.'
required: true
default: 'x64'
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy:
matrix:
arch: [x64, arm64]
steps: steps:
- name: Dependencies - name: Dependencies
run: | run: |
@ -40,7 +39,7 @@ jobs:
out_file = "wsa.zip" out_file = "wsa.zip"
arch = "${{ github.event.inputs.arch }}" arch = "${{ matrix.arch }}"
if not os.path.isfile(out_file): if not os.path.isfile(out_file):
urllib.request.urlretrieve(link, out_file) urllib.request.urlretrieve(link, out_file)
@ -71,7 +70,7 @@ jobs:
out_file = "magisk.zip" out_file = "magisk.zip"
arch = "${{ github.event.inputs.arch }}" arch = "${{ matrix.arch }}"
abi_map={"x64" : ["x86_64", "x86"], "arm64" : ["arm64-v8a", "armeabi-v7a"]} abi_map={"x64" : ["x86_64", "x86"], "arm64" : ["arm64-v8a", "armeabi-v7a"]}
@ -90,13 +89,13 @@ jobs:
extract_as(zip, f"lib/{ abi_map['x64'][0] }/libmagiskinit.so", "magiskpolicy", "magisk") extract_as(zip, f"lib/{ abi_map['x64'][0] }/libmagiskinit.so", "magiskpolicy", "magisk")
- name: Expand images - name: Expand images
run: | run: |
e2fsck -yf ${{ github.event.inputs.arch }}/vendor.img e2fsck -yf ${{ matrix.arch }}/vendor.img
resize2fs ${{ github.event.inputs.arch }}/vendor.img 320M resize2fs ${{ matrix.arch }}/vendor.img 320M
- name: Mount images - name: Mount images
run: | run: |
sudo mkdir system sudo mkdir system
sudo mount -o loop ${{ github.event.inputs.arch }}/system.img system sudo mount -o loop ${{ matrix.arch }}/system.img system
sudo mount -o loop ${{ github.event.inputs.arch }}/vendor.img system/vendor sudo mount -o loop ${{ matrix.arch }}/vendor.img system/vendor
- name: Modify images - name: Modify images
run: | run: |
sudo mkdir system/sbin sudo mkdir system/sbin
@ -160,15 +159,15 @@ jobs:
sudo umount system sudo umount system
- name: Shrink images - name: Shrink images
run: | run: |
e2fsck -yf ${{ github.event.inputs.arch }}/system.img e2fsck -yf ${{ matrix.arch }}/system.img
resize2fs ${{ github.event.inputs.arch }}/system.img resize2fs ${{ matrix.arch }}/system.img
e2fsck -yf ${{ github.event.inputs.arch }}/vendor.img e2fsck -yf ${{ matrix.arch }}/vendor.img
resize2fs ${{ github.event.inputs.arch }}/vendor.img resize2fs ${{ matrix.arch }}/vendor.img
- name: Remove signature - name: Remove signature
run: | run: |
rm -rf ${{ github.event.inputs.arch }}/\[Content_Types\].xml ${{ github.event.inputs.arch }}/AppxBlockMap.xml ${{ github.event.inputs.arch }}/AppxSignature.p7x ${{ github.event.inputs.arch }}/AppxMetadata rm -rf ${{ matrix.arch }}/\[Content_Types\].xml ${{ matrix.arch }}/AppxBlockMap.xml ${{ matrix.arch }}/AppxSignature.p7x ${{ matrix.arch }}/AppxMetadata
- name: Upload WSA - name: Upload WSA
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: WSA-with-Magisk name: WSA-with-Magisk_${{ matrix.arch }}
path: './${{ github.event.inputs.arch }}/*' path: './${{ matrix.arch }}/*'

View File

@ -3,7 +3,7 @@
## Usage ## Usage
1. Fork this repo 1. Fork this repo
1. Go to Action tab and select workflow `Magisk`, click the run button and enter the needed infomation (architecture and magisk apk download link) 1. Go to Action tab and select workflow `Magisk`, click the run button and enter the needed infomation (magisk apk download link)
1. Wait the action complete and download the artifact 1. Wait the action complete and download the artifact
1. Uninstall WSA 1. Uninstall WSA
1. Unzip the artifact 1. Unzip the artifact