From 6c245fce176d2a39da684eb97e4d0b7663c55e65 Mon Sep 17 00:00:00 2001
From: Arnold <arnold.dech@adct.be>
Date: Sat, 11 May 2024 03:14:58 +0200
Subject: [PATCH] Rolling back to stuff that actually works (#49)

---
 .github/workflows/deploy.yml     | 36 ++++++++++++++++
 .github/workflows/deployment.yml | 71 --------------------------------
 .github/workflows/static.yml     | 43 +++++++++++++++++++
 3 files changed, 79 insertions(+), 71 deletions(-)
 create mode 100644 .github/workflows/deploy.yml
 delete mode 100644 .github/workflows/deployment.yml
 create mode 100644 .github/workflows/static.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..7d0227c
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,36 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+
+concurrency:
+  group: master
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure SSH
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_PRIVATE_KEY" > ~/.ssh/github
+          chmod 600 ~/.ssh/github
+          cat >>~/.ssh/config <<END
+          Host target
+            HostName $SSH_HOST
+            User $SSH_USER
+            IdentityFile ~/.ssh/github
+            LogLevel ERROR
+            StrictHostKeyChecking no
+          END
+      - name: Run Deploy
+        run: |
+          ssh target "cd tldtest && git pull origin master && docker-compose down && docker-compose up --build -d"
\ No newline at end of file
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
deleted file mode 100644
index b89f3f3..0000000
--- a/.github/workflows/deployment.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Master Workflow
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy_after_master_push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Set up Python 3.11 for Flake8
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.11"
-          
-      - name: Install Flake8
-        run: pip install flake8
-
-      - name: Lint with Flake8
-        run: flake8 --ignore=E501,F401,E402,F811,E731,F403,E722 .
-
-      - name: Set up Python 3.11 for Django
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.11"
-
-      - name: Install Dependencies for Django
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          cp config.example.py config.py
-
-      - name: Run Tests for Django
-        run: |
-          python manage.py test
-
-      - name: Configure SSH for Deployment
-        if: success()
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          SSH_HOST: ${{ secrets.SSH_HOST }}
-          SSH_USER: ${{ secrets.SSH_USER }}
-        run: |
-          mkdir -p ~/.ssh/
-          echo "$SSH_PRIVATE_KEY" > ~/.ssh/github
-          chmod 600 ~/.ssh/github
-          cat >>~/.ssh/config <<END
-          Host target
-            HostName $SSH_HOST
-            User $SSH_USER
-            IdentityFile ~/.ssh/github
-            LogLevel ERROR
-            StrictHostKeyChecking no
-          END
-
-      - name: Deploy to Production
-        if: success() && github.ref == 'refs/heads/master'
-        run: |
-          ssh target "cd tldtest && git pull origin master && docker-compose down && docker-compose up --build -d"
-
-      # Other steps for deploying static content to GitHub Pages
-      - name: Deploy static content to GitHub Pages
-        if: success() && github.ref == 'refs/heads/master'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./staticfiles
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
new file mode 100644
index 0000000..a9829d6
--- /dev/null
+++ b/.github/workflows/static.yml
@@ -0,0 +1,43 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: './staticfiles'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
\ No newline at end of file