Skip to content

Commit e00f8e7

Browse files
yodaluca23yodaluca23
authored
Workflow fixes & more logs
1 parent 66ceb75 commit e00f8e7

1 file changed

Lines changed: 41 additions & 39 deletions

File tree

‎.github/workflows/Build and Release.yml‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ jobs:
3434
echo "EEVEEVERSION=${{ github.event.inputs.EEVEEVERSION }}" >> $GITHUB_ENV
3535
echo "CHANGEVERSION=${{ github.event.inputs.CHANGEVERSION }}" >> $GITHUB_ENV
3636
echo "SPOTURL=${{ github.event.inputs.SPOTURL }}" >> $GITHUB_ENV
37-
echo "VIRUSTOTALKEY=${{ secrets.VIRUSTOTALKEY }}" >> $GITHUB_ENV
3837
3938
- name: Set Workflow URL
4039
run: |
4140
echo "WORKFLOWURL=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
42-
echo "Workflow URL is $WORKFLOWURL"
41+
echo "Workflow URL is ${{ env.WORKFLOWURL }}"
4342
4443
- name: Set EeveeSpotify Repo if given
4544
if: ${{ github.event.inputs.EEVEEREPO != '' }}
@@ -66,8 +65,8 @@ jobs:
6665
run: |
6766
echo "EEVEEVERSION not provided, fetching latest release tag..."
6867
EEVEETAG=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.EEVEEREPO }}/releases/latest | jq -r .tag_name)
69-
echo "Latest release tag: $EEVEETAG"
7068
echo "EEVEETAG=$EEVEETAG" >> $GITHUB_ENV
69+
echo "Latest release tag: ${{ env.EEVEETAG }}"
7170
7271
- name: Set EEVEETAG if tag provided
7372
if: ${{ env.EEVEEVERSION != '' }}
@@ -88,7 +87,7 @@ jobs:
8887
# If no matching tag is found, fail the job
8988
echo "No matching tag found for EEVEEVERSION=$EEVEEVERSION"
9089
exit 1
91-
echo "Using Release Tag: $EEVEETAG"
90+
echo "Using Release Tag: ${{ env.EEVEETAG }}"
9291
9392
- name: Create Build Components folder
9493
run: mkdir -p "Build Components"
@@ -105,15 +104,15 @@ jobs:
105104
SPOTURL: ${{ github.event.inputs.SPOTURL }}
106105

107106
- name: Upload Spotify IPA to VirusTotal
108-
if: ${{ env.VIRUSTOTALKEY }}
107+
if: ${{ secrets.VIRUSTOTALKEY }}
109108
uses: crazy-max/ghaction-virustotal@v4
110109
id: vt-spotify
111110
with:
112111
files: "${{ env.spotifypath }}"
113-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
112+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
114113

115114
- name: Set VirusTotal Analysis URL for Spotify IPA
116-
if: ${{ env.VIRUSTOTALKEY }}
115+
if: ${{ secrets.VIRUSTOTALKEY }}
117116
run: echo "VTVANILLASPOTIFY=${{ steps.vt-spotify.outputs.analysis }}" >> $GITHUB_ENV
118117

119118
- name: Download and process Orion
@@ -175,15 +174,15 @@ jobs:
175174
echo "ORIONVERSION=$ORIONVERSION" >> $GITHUB_ENV
176175

177176
- name: Upload Orion to VirusTotal
178-
if: ${{ env.VIRUSTOTALKEY }}
177+
if: ${{ secrets.VIRUSTOTALKEY }}
179178
uses: crazy-max/ghaction-virustotal@v4
180179
id: vt-orion
181180
with:
182181
files: "${{ env.orion }}"
183-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
182+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
184183

185184
- name: Set VirusTotal Analysis URL for Orion
186-
if: ${{ env.VIRUSTOTALKEY }}
185+
if: ${{ secrets.VIRUSTOTALKEY }}
187186
run: echo "VTORION=${{ steps.vt-orion.outputs.analysis }}" >> $GITHUB_ENV
188187

189188
- name: Download and process Sposify
@@ -245,15 +244,15 @@ jobs:
245244

246245

247246
- name: Upload Sposify to VirusTotal
248-
if: ${{ env.VIRUSTOTALKEY }}
247+
if: ${{ secrets.VIRUSTOTALKEY }}
249248
uses: crazy-max/ghaction-virustotal@v4
250249
id: vt-sposify
251250
with:
252251
files: "${{ env.sposify }}"
253-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
252+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
254253

255254
- name: Set VirusTotal Analysis URL for Sposify
256-
if: ${{ env.VIRUSTOTALKEY }}
255+
if: ${{ secrets.VIRUSTOTALKEY }}
257256
run: echo "VTSPOSIFY=${{ steps.vt-sposify.outputs.analysis }}" >> $GITHUB_ENV
258257

259258
- name: Download and process SposifyFix
@@ -314,15 +313,15 @@ jobs:
314313
echo "SPOSIFYFIXVERSION=$SPOSIFYFIXVERSION" >> $GITHUB_ENV
315314

316315
- name: Upload SposifyFix to VirusTotal
317-
if: ${{ env.VIRUSTOTALKEY }}
316+
if: ${{ secrets.VIRUSTOTALKEY }}
318317
uses: crazy-max/ghaction-virustotal@v4
319318
id: vt-sposifyfix
320319
with:
321320
files: "${{ env.sposifyfix }}"
322-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
321+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
323322

324323
- name: Set VirusTotal Analysis URL for SposifyFix
325-
if: ${{ env.VIRUSTOTALKEY }}
324+
if: ${{ secrets.VIRUSTOTALKEY }}
326325
run: echo "VTSPOSIFYFIX=${{ steps.vt-sposifyfix.outputs.analysis }}" >> $GITHUB_ENV
327326

328327
- name: Download EeveeSpotify .deb file from releases
@@ -359,20 +358,20 @@ jobs:
359358
360359
361360
- name: Upload EeveeSpotify to VirusTotal
362-
if: ${{ env.VIRUSTOTALKEY }}
361+
if: ${{ secrets.VIRUSTOTALKEY }}
363362
uses: crazy-max/ghaction-virustotal@v4
364363
id: vt-eevee
365364
with:
366365
files: "${{ env.eevee-arm }}"
367-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
366+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
368367

369368
- name: Get Eevee release name
370369
run: |
371370
RELEASE_TITLE=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ env.EEVEEREPO }}/releases/tags/${{ env.EEVEETAG }}" | jq -r '.name')
372371
echo "EEVEEVERSIONNAME=$RELEASE_TITLE" >> $GITHUB_ENV
373372
374373
- name: Set VirusTotal Analysis URL for EeveeSpotify
375-
if: ${{ env.VIRUSTOTALKEY }}
374+
if: ${{ secrets.VIRUSTOTALKEY }}
376375
run: echo "VTEEVEE=${{ steps.vt-eevee.outputs.analysis }}" >> $GITHUB_ENV
377376

378377
- name: Download SwiftProtobuf .deb file
@@ -391,15 +390,15 @@ jobs:
391390
EEVEETAG: ${{ env.EEVEETAG }}
392391

393392
- name: Upload SwiftProtobuf to VirusTotal
394-
if: ${{ env.VIRUSTOTALKEY }}
393+
if: ${{ secrets.VIRUSTOTALKEY }}
395394
uses: crazy-max/ghaction-virustotal@v4
396395
id: vt-swiftprotobuf
397396
with:
398397
files: "${{ env.swiftprotobuf }}"
399-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
398+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
400399

401400
- name: Set VirusTotal Analysis URL for SwiftProtobuf
402-
if: ${{ env.VIRUSTOTALKEY }}
401+
if: ${{ secrets.VIRUSTOTALKEY }}
403402
run: echo "VTSWIFTPROTOBUF=${{ steps.vt-swiftprotobuf.outputs.analysis }}" >> $GITHUB_ENV
404403

405404
- name: Clone OpenSpotifySafariExtension
@@ -410,7 +409,7 @@ jobs:
410409
cp -R OpenSpotifySafariExtension/OpenSpotifySafariExtension.appex "Build Components/OpenSpotifySafariExtension.appex"
411410
echo "EXTCOMMIT=$(git -C OpenSpotifySafariExtension rev-parse --short HEAD)"
412411
echo "EXTCOMMIT=$(git -C OpenSpotifySafariExtension rev-parse --short HEAD)" >> $GITHUB_ENV
413-
echo "Extensions Commit is: $EXTCOMMIT"
412+
echo "Extensions Commit is: ${{ env.EXTCOMMIT }}"
414413
echo "OSSEXT=Build Components/OpenSpotifySafariExtension.appex" >> $GITHUB_ENV
415414
416415
- name: Compress OpenSpotifySafariExtension to zip
@@ -421,15 +420,15 @@ jobs:
421420
ditto -c -k --sequesterRsrc --keepParent ./ "../Build Components/OpenSpotifySafariExtension.zip"
422421
423422
- name: Upload OpenSpotifySafariExtension to VirusTotal
424-
if: ${{ env.VIRUSTOTALKEY }}
423+
if: ${{ secrets.VIRUSTOTALKEY }}
425424
uses: crazy-max/ghaction-virustotal@v4
426425
id: vt-openspotify
427426
with:
428427
files: "Build Components/OpenSpotifySafariExtension.zip"
429-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
428+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
430429

431430
- name: Set VirusTotal Analysis URL for OpenSpotifySafariExtension
432-
if: ${{ env.VIRUSTOTALKEY }}
431+
if: ${{ secrets.VIRUSTOTALKEY }}
433432
run: |
434433
echo "VTEXT=${{ steps.vt-openspotify.outputs.analysis }}" >> $GITHUB_ENV
435434
rm -f "Build Components/OpenSpotifySafariExtension.zip"
@@ -446,7 +445,7 @@ jobs:
446445
447446
MIN_IOS_VERSION=$(/usr/libexec/PlistBuddy -c 'Print :MinimumOSVersion' Info.plist)
448447
echo "MIN_IOS_VERSION=$MIN_IOS_VERSION" >> $GITHUB_ENV
449-
echo "Minimum iOS Version: $MIN_IOS_VERSION"
448+
echo "Minimum iOS Version: ${{ env.MIN_IOS_VERSION }}"
450449
451450
(echo "{"; find ./ -name "Info.plist" | while read file; do plutil -p "$file" 2>/dev/null | grep -E "NS.*Description" | sed -E 's/^\s*"([^"]+)".*"(.*)"$/"\1": "\2",/'; done | sed 's/ =>/:/g' | sed 's/\(.*\),/\1/' | tr '\n' ',' | sed 's/,$//' | sed 's/,/,\n/g'; echo "}") > NSDescriptions.json
452451
@@ -549,7 +548,6 @@ jobs:
549548
echo "CHANGEVERSION=$CHANGEVERSION" >> $GITHUB_ENV
550549
echo "Using ChangeVersion: $CHANGEVERSION"
551550
552-
553551
- name: Set Components Path
554552
run: echo "componentspath=Build Components" >> $GITHUB_ENV
555553

@@ -558,50 +556,54 @@ jobs:
558556
Cyan -i "${{ env.spotifypath }}" -o "${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}.ipa" -v ${{ env.CHANGEVERSION }} -f "${{ env.sposifyfix }}" "${{ env.sposify }}" "${{ env.OSSEXT }}" "${{ env.orion }}" "${{ env.swiftprotobuf }}" "${{ env.eevee-arm }}" -u -w
559557
echo "patchedspotify=${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}.ipa"
560558
echo "patchedspotify=${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}.ipa" >> $GITHUB_ENV
561-
echo "Patched Spotify .ipa Located: $patchedspotify"
559+
echo "Patched Spotify .ipa Located: ${{ env.patchedspotify }}"
562560
563561
- name: Upload SpotifyPatched.ipa to VirusTotal
564-
if: ${{ env.VIRUSTOTALKEY }}
562+
if: ${{ secrets.VIRUSTOTALKEY }}
565563
uses: crazy-max/ghaction-virustotal@v4
566564
id: vt-spotc
567565
with:
568566
files: "${{ env.patchedspotify }}"
569-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
567+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
570568

571569
- name: Set VirusTotal Analysis URL for SpotC++
572-
if: ${{ env.VIRUSTOTALKEY }}
570+
if: ${{ secrets.VIRUSTOTALKEY }}
573571
run: echo "VTSPOTC=${{ steps.vt-spotc.outputs.analysis }}" >> $GITHUB_ENV
574572

575573
- name: Run Cyan AltStore
576574
run: |
577575
Cyan -i "${{ env.spotifypath }}" -o "${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}_ALTSTORESOURCE_ONLY.ipa" -v ${{ env.CHANGEVERSION }} -b com.yodaluca23.SpotCPlusPlus -f "${{ env.sposifyfix }}" "${{ env.sposify }}" "${{ env.OSSEXT }}" "${{ env.orion }}" "${{ env.swiftprotobuf }}" "${{ env.eevee-arm }}" -u -w
578576
echo "altpatchedspotify=${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}_ALTSTORESOURCE_ONLY.ipa"
579577
echo "altpatchedspotify=${{ env.componentspath }}/SpotC++.v${{ env.CHANGEVERSION }}_v${{ env.VANILLASPOTIFYVERSION }}_ALTSTORESOURCE_ONLY.ipa" >> $GITHUB_ENV
580-
echo "AltStore Patched Spotify .ipa Located: $altpatchedspotify"
578+
echo "AltStore Patched Spotify .ipa Located: ${{ env.altpatchedspotify }}"
581579
582580
- name: Upload AltSpotifyPatched.ipa to VirusTotal
583-
if: ${{ env.VIRUSTOTALKEY }}
581+
if: ${{ secrets.VIRUSTOTALKEY }}
584582
uses: crazy-max/ghaction-virustotal@v4
585583
id: vt-altspotc
586584
with:
587585
files: "${{ env.altpatchedspotify }}"
588-
vt_api_key: ${{ env.VIRUSTOTALKEY }}
586+
vt_api_key: ${{ secrets.VIRUSTOTALKEY }}
589587

590588
- name: Set VirusTotal Analysis URL for AltSpotC++
591-
if: ${{ env.VIRUSTOTALKEY }}
589+
if: ${{ secrets.VIRUSTOTALKEY }}
592590
run: echo "VTALTSPOTC=${{ steps.vt-altspotc.outputs.analysis }}" >> $GITHUB_ENV
593591

594592
- name: Upload to Catbox (With Hash)
595593
if: ${{ secrets.CATBOXHASH }}
596594
run: |
597595
echo "RELEASEURL=$(curl -F "reqtype=fileupload" -F "userhash=${{ secrets.CATBOXHASH }}" -F "fileToUpload=@${{ env.patchedspotify }}" https://catbox.moe/user/api.php)" >> $GITHUB_ENV
598596
echo "RELEASEURLALTSTORE=$(curl -F "reqtype=fileupload" -F "userhash=${{ secrets.CATBOXHASH }}" -F "fileToUpload=@${{ env.altpatchedspotify }}" https://catbox.moe/user/api.php)" >> $GITHUB_ENV
599-
597+
echo "Standard Release Download URL: ${{ env.RELEASEURL }}"
598+
echo "AltStore Release Download URL: ${{ env.RELEASEURLALTSTORE }}"
599+
600600
- name: Upload to Catbox (Without Hash)
601-
if: ${{ !secrets.CATBOXHASH }}
601+
if: ${{ secrets.CATBOXHASH == '' }}
602602
run: |
603603
echo "RELEASEURL=$(curl -F "reqtype=fileupload" -F "fileToUpload=@${{ env.patchedspotify }}" https://catbox.moe/user/api.php)" >> $GITHUB_ENV
604604
echo "RELEASEURLALTSTORE=$(curl -F "reqtype=fileupload" -F "fileToUpload=@${{ env.altpatchedspotify }}" https://catbox.moe/user/api.php)" >> $GITHUB_ENV
605+
echo "Standard Release Download URL: ${{ env.RELEASEURL }}"
606+
echo "AltStore Release Download URL: ${{ env.RELEASEURLALTSTORE }}"
605607
606608
- name: Extract and Prepare VirusTotal Links
607609
run: |
@@ -696,7 +698,7 @@ jobs:
696698
echo "App .ipa modified and tweaks injected using [my fork](https://github.com/yodaluca23/pyzule-rw) of [Cyan](https://github.com/asdfzxcvbn/pyzule-rw) with [the github Action Workflow.](${{ env.WORKFLOWURL }}) </br>" >> changelog.txt
697699
698700
- name: Construct ChangeLog Pt.7 (Add Version Details & VirusTotal Results)
699-
if: ${{ env.VIRUSTOTALKEY != '' }}
701+
if: ${{ secrets.VIRUSTOTALKEY != '' }}
700702
run: |
701703
echo "<details>" >> changelog.txt
702704
echo "<summary>Version Details & VirusTotal Results</summary>" >> changelog.txt

0 commit comments

Comments
 (0)