GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-26 16:12:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'braid/pages-fixes' into 'main'

Browse Source 
fix: pages deployment fixes

See merge request famedly/fluffychat!989
This commit is contained in:
Krille Fear 2022-08-19 10:06:49 +00:00
commit 22eda121d8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -220,6 +220,8 @@ pages:
- mv docs public - mv docs public
- mv repo public || true - mv repo public || true
- mv build/web/ public/nightly - mv build/web/ public/nightly
# ensure the nightly deployment knows its location
- sed -i "s/href=\"\/web\/\"/href=\"\/nightly\/\"/g" public/nightly/index.html
- rm -rf build - rm -rf build
- ./scripts/download-web-stable.sh - ./scripts/download-web-stable.sh
- mv stable public/web - mv stable public/web

11
scripts/create_fdroid_repos.sh
View File

@ -7,10 +7,10 @@ mkdir repo
git fetch git fetch
cd fdroid
# building nightly repo # building nightly repo
cd fdroid
cp config.nightly.py config.py cp config.nightly.py config.py
PIPELINES="$(curl https://gitlab.com/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines\?ref=main\&status=success\&order_by=updated_at | jq '.[].id' | head -n3)" PIPELINES="$(curl https://gitlab.com/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines\?ref=main\&status=success\&order_by=updated_at | jq '.[].id' | head -n3)"
@ -31,13 +31,12 @@ done
fdroid update --rename-apks fdroid update --rename-apks
mkdir /fdroid && fdroid deploy mkdir /fdroid && fdroid deploy
rm -rf /fdroid rm -rf /fdroid/archive
cd .. && mkdir public && mv -v /fdroid repo/nightly cd .. && mv -v /fdroid repo/nightly
# building stable + RC repo # building stable + RC repo
mkdir /fdroid rm -rf /fdroid
cd fdroid cd fdroid
rm -f repo/*.apk rm -f repo/*.apk