Skip to content

Fix GitHub instance action workflow #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hjiangsu merged 17 commits into from
Dec 5, 2023
Merged

Fix GitHub instance action workflow #957

Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ec166ce
testing newline changes
hjiangsu Dec 5, 2023
8d0829c
removed pr creation temporarily, adjusted newline logic
hjiangsu Dec 5, 2023
9785b20
more newline adjustments
hjiangsu Dec 5, 2023
5005fdd
more newline adjustments
hjiangsu Dec 5, 2023
9732b53
more newline adjustments
hjiangsu Dec 5, 2023
3a0cff7
more newline adjustments
hjiangsu Dec 5, 2023
d70cfcd
more newline adjustments
hjiangsu Dec 5, 2023
4159331
more newline adjustments
hjiangsu Dec 5, 2023
0a41188
using printf instead, added more logic to format output file properly
hjiangsu Dec 5, 2023
d9c0400
removed echo
hjiangsu Dec 5, 2023
9becb80
testing return code
hjiangsu Dec 5, 2023
f8e33de
reverting back
hjiangsu Dec 5, 2023
f9a8fb9
slowly adding back items
hjiangsu Dec 5, 2023
4ac7cd7
slowly adding back items
hjiangsu Dec 5, 2023
7302ab4
slowly adding back items
hjiangsu Dec 5, 2023
3ef8e00
slowly adding back items
hjiangsu Dec 5, 2023
0ee4f78
added back newline
hjiangsu Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/instances.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,25 @@ jobs:
mv android/app/src/main/AndroidManifest-new.xml android/app/src/main/AndroidManifest.xml

# ---------- Safari Extension ----------
totalLines=$(wc -l < lemmy-instances.txt)
currentLine=0

safariManifestInstances=""
safariContentInstances=""
lastLine=true

# Generate the Safari extension domains used in manifest.json and content.js
# It ignores the last comma in the list to generate proper json
while IFS= read -r instance; do
if [ "$lastLine" = true ]; then
currentLine=$((currentLine + 1))

if [ "$currentLine" -eq 1 ]; then
# First line
safariManifestInstances=" \"*://$instance/*\""
safariContentInstances=" \"$instance"\"
lastLine=false
safariContentInstances=" \"$instance\""
elif [ "$currentLine" -eq "$totalLines" ]; then
# Last line
safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"\n"
safariContentInstances="$safariContentInstances,\n \"$instance\"\n"
else
safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\""
safariContentInstances="$safariContentInstances,\n \"$instance\""
Expand All @@ -84,7 +91,7 @@ jobs:
fi

if [[ $line == " ]" ]]; then
echo "$safariManifestInstances" >> "ios/Open In Thunder/Resources/manifest-new.json"
printf "$safariManifestInstances" >> "ios/Open In Thunder/Resources/manifest-new.json"
inSection=false
fi

Expand All @@ -106,7 +113,7 @@ jobs:
fi

if [[ $line == "];" ]]; then
echo "$safariContentInstances" >> "ios/Open In Thunder/Resources/content-new.js"
printf "$safariContentInstances" >> "ios/Open In Thunder/Resources/content-new.js"
inSection=false
fi

Expand All @@ -128,4 +135,4 @@ jobs:
body: This PR is updating `lemmy-instances.txt`, `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of instances retrieved from fediverse.observer.
branch: update-instances
delete-branch: true
author: GitHub <noreply@github.com>
author: GitHub <noreply@github.com>