Merge pull request #177 from TechAachen/fix-deployment-2

Fix deployment to new server (3)

Author: rleh

.github/workflows/build-upload.yml

@@ -37,20 +37,20 @@ jobs:
        rm _site/techaachen-calendar.ics.in
 
     - name: Upload to www.techaachen.de
-      if: github.head_ref == 'refs/heads/main'
+      if: github.event.pull_request.merged == true
       env:
         UPLOAD_AUTH_2: ${{ secrets.UPLOAD_AUTH_2 }}
       run: |
        cd _site
        find -type f -print0 | sed -z 's/^.\///' | xargs -P8 -I{} -0 curl -s --user $UPLOAD_AUTH_2 --fail -w '%{method} %{url} %{http_code}\n' -X PUT --upload-file ./{} https://www.techaachen.de/{}
 
-    - name: Upload to preview2.techaachen.de
-      if: github.head_ref != 'refs/heads/main'
+    - name: Upload to preview.techaachen.de
+      if: github.event.pull_request.merged != true
       env:
         UPLOAD_AUTH_2: ${{ secrets.UPLOAD_AUTH_2 }}
       run: |
        export BRANCH=$(echo ${{github.head_ref}}|sed 's|refs/heads||')
        echo $BRANCH
        cd _site
-       curl -s --user $UPLOAD_AUTH_2 -X DELETE https://preview2.techaachen.de/$BRANCH/ || true
-       find -type f -print0 | sed -z 's/^.\///' | xargs -P8 -I{} -0 curl -s --user $UPLOAD_AUTH_2 --fail -w '%{method} %{url} %{http_code}\n' -X PUT --upload-file ./{} https://preview2.techaachen.de/$BRANCH/{}
+       curl -s --user $UPLOAD_AUTH_2 -X DELETE https://preview.techaachen.de/$BRANCH/ || true
+       find -type f -print0 | sed -z 's/^.\///' | xargs -P8 -I{} -0 curl -s --user $UPLOAD_AUTH_2 --fail -w '%{method} %{url} %{http_code}\n' -X PUT --upload-file ./{} https://preview.techaachen.de/$BRANCH/{}