Skip to content

Commit 4c1025f

Browse files
Revert "Build VDC and IRS packs as seperate release assets"
Those seperate release assets were mostly only confusing and not helpful. This partially reverts commit f407e57.
1 parent 864fafa commit 4c1025f

File tree

2 files changed

+11
-30
lines changed

2 files changed

+11
-30
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@ jobs:
1919
uses: actions/upload-artifact@v3
2020
with:
2121
name: ViPER4AndroidRepackaged.zip
22-
path: |
23-
ViPER4AndroidFX-*.zip
24-
ViperIRS-*.zip
25-
ViperVDC-*.zip
22+
path: ViPER4AndroidFX-*.zip
2623
if-no-files-found: error

compile.sh

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,19 @@ setVersionVariables() {
4242
FILENAMEVERSION=$REPACKAGEDSTRING$CHANGES$COMMITHASH
4343
}
4444

45-
(
46-
git clean -Xdfq magiskmodule/
45+
git clean -Xdfq magiskmodule/
4746

48-
setVersionVariables .
47+
setVersionVariables .
4948

50-
cp -f README.md magiskmodule/README.md &
51-
declare -x VERSION VERSIONCODE REPACKAGEDSTRING
52-
envsubst < module.prop > magiskmodule/module.prop &
49+
cp -f README.md magiskmodule/README.md &
50+
declare -x VERSION VERSIONCODE REPACKAGEDSTRING
51+
envsubst < module.prop > magiskmodule/module.prop &
5352

54-
OUTPUT_FILE="ViPER4AndroidFX-$FILENAMEVERSION.zip"
55-
rm -f ViPER4AndroidFX-repackaged*.zip &
53+
OUTPUT_FILE="ViPER4AndroidFX-$FILENAMEVERSION.zip"
54+
rm -f ViPER4AndroidFX-repackaged*.zip &
5655

57-
compressArchiveTarGz ViperIRS/"*.irs" magiskmodule/"$VIPERIRSFILE" &
58-
compressArchiveTarGz ViperVDC/"*.vdc" magiskmodule/"$VIPERVDCFILE" &
59-
60-
wait
61-
compressArchiveZip "magiskmodule/." "$OUTPUT_FILE"
62-
) &
63-
64-
(
65-
rm -f ViperIRS-*.zip
66-
setVersionVariables ViperIRS
67-
compressArchiveZip ViperIRS/"*.irs" ViperIRS-$FILENAMEVERSION.zip
68-
) &
69-
70-
(
71-
rm -f ViperVDC-*.zip
72-
setVersionVariables ViperVDC
73-
compressArchiveZip ViperVDC/"*.vdc" ViperVDC-$FILENAMEVERSION.zip
74-
) &
56+
compressArchiveTarGz ViperIRS/"*.irs" magiskmodule/"$VIPERIRSFILE" &
57+
compressArchiveTarGz ViperVDC/"*.vdc" magiskmodule/"$VIPERVDCFILE" &
7558

7659
wait
60+
compressArchiveZip "magiskmodule/." "$OUTPUT_FILE"

0 commit comments

Comments
 (0)