1
0
Fork 0
mirror of https://github.com/benbusby/farside.git synced 2025-04-20 10:58:42 +00:00

Use full service list in auto update workflow

This commit is contained in:
Ben Busby 2022-07-27 16:36:31 -06:00
parent 3597799cf3
commit 2e7d4355c5
No known key found for this signature in database
GPG key ID: B9B7231E01D924A1

View file

@ -20,16 +20,16 @@ jobs:
- name: Fetch instances - name: Fetch instances
run: | run: |
function apply_update() { function apply_update() {
mv services-tmp.json services.json mv services-tmp.json services-full.json
rm -f *-tmp.json rm -f *-tmp.json
# Ensure no trailing slashes for any instance # Ensure no trailing slashes for any instance
sed -i 's/\/"/"/g' services.json sed -i 's/\/"/"/g' services-full.json
} }
function remove_cf_instances() { function remove_cf_instances() {
rm out.json rm out.json
file="services.json" file="services-full.json"
while read -r line; do while read -r line; do
if [[ "$line" == "\"https://"* ]]; then if [[ "$line" == "\"https://"* ]]; then
@ -48,7 +48,6 @@ jobs:
# Remove any trailing commas from new instance lists # Remove any trailing commas from new instance lists
sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
mv services.json services-full.json
cat out.json | jq --indent 2 . > services.json cat out.json | jq --indent 2 . > services.json
rm out.json rm out.json
} }
@ -84,7 +83,7 @@ jobs:
jq --slurpfile searx searx-tmp.json \ jq --slurpfile searx searx-tmp.json \
'( .[] | select(.type == "searx") ) '( .[] | select(.type == "searx") )
.instances |= $searx[0]' services.json > services-tmp.json .instances |= $searx[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -112,7 +111,7 @@ jobs:
jq --slurpfile searxng searxng-tmp.json \ jq --slurpfile searxng searxng-tmp.json \
'( .[] | select(.type == "searxng") ) '( .[] | select(.type == "searxng") )
.instances |= $searxng[0]' services.json > services-tmp.json .instances |= $searxng[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -125,7 +124,7 @@ jobs:
jq --slurpfile simplytranslate st-tmp.json \ jq --slurpfile simplytranslate st-tmp.json \
'( .[] | select(.type == "simplytranslate") ) '( .[] | select(.type == "simplytranslate") )
.instances |= $simplytranslate[0]' services.json > services-tmp.json .instances |= $simplytranslate[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -137,7 +136,7 @@ jobs:
jq --slurpfile whoogle whoogle-tmp.json \ jq --slurpfile whoogle whoogle-tmp.json \
'( .[] | select(.type == "whoogle") ) '( .[] | select(.type == "whoogle") )
.instances |= $whoogle[0]' services.json > services-tmp.json .instances |= $whoogle[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -152,7 +151,7 @@ jobs:
sort' > invidious-tmp.json sort' > invidious-tmp.json
jq --slurpfile invidious invidious-tmp.json \ jq --slurpfile invidious invidious-tmp.json \
'( .[] | select(.type == "invidious") ) '( .[] | select(.type == "invidious") )
.instances |= $invidious[0]' services.json > services-tmp.json .instances |= $invidious[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -162,7 +161,7 @@ jobs:
curl -s https://git.sr.ht/~edwardloveall/scribe/blob/main/docs/instances.json > scribe-tmp.json curl -s https://git.sr.ht/~edwardloveall/scribe/blob/main/docs/instances.json > scribe-tmp.json
jq --slurpfile scribe scribe-tmp.json \ jq --slurpfile scribe scribe-tmp.json \
'( .[] | select(.type == "scribe") ) '( .[] | select(.type == "scribe") )
.instances |= $scribe[0]' services.json > services-tmp.json .instances |= $scribe[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -177,7 +176,7 @@ jobs:
sort' > teddit-tmp.json sort' > teddit-tmp.json
jq --slurpfile teddit teddit-tmp.json \ jq --slurpfile teddit teddit-tmp.json \
'( .[] | select(.type == "teddit") ) '( .[] | select(.type == "teddit") )
.instances |= $teddit[0]' services.json > services-tmp.json .instances |= $teddit[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -191,7 +190,7 @@ jobs:
sort' > wikiless-tmp.json sort' > wikiless-tmp.json
jq --slurpfile wikiless wikiless-tmp.json \ jq --slurpfile wikiless wikiless-tmp.json \
'( .[] | select(.type == "wikiless") ) '( .[] | select(.type == "wikiless") )
.instances |= $wikiless[0]' services.json > services-tmp.json .instances |= $wikiless[0]' services-full.json > services-tmp.json
apply_update apply_update
@ -207,6 +206,6 @@ jobs:
# ============================================================== # ==============================================================
# Push changes # Push changes
# ============================================================== # ==============================================================
git add services.json git add services.json services-full.json
git commit -m '[CI] Auto update instances' || exit 0 git commit -m '[CI] Auto update instances' || exit 0
git push git push