Merge master

This commit is contained in:
Pieter Vander Vennet 2023-08-24 12:22:45 +02:00
commit 7ebb3d721c
411 changed files with 21814 additions and 8717 deletions

View file

@ -65,10 +65,10 @@ jobs:
- name: "Copying files"
run: |
echo "Deploying"
rm -rf pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/*
mkdir -p pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
cp -r dist/* pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
cd pietervdvn.github.io/
rm -rf mapcomplete.github.io/*
cp -r dist/* mapcomplete.github.io/
cd mapcomplete.github.io/
echo "mapcomplete.org" > CNAME
git add *
if git status | grep -q "Changes to be committed"
then