From 6e005690daee655c5f3667ad73476c326148d319 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Fri, 13 Oct 2023 00:05:15 +0200
Subject: [PATCH 1/5] fix project template

---
 .woodpecker/deploy.yml                   |  2 ++
 templates/page/simple/projects.html.twig | 40 +++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index 19a73fd..d84cf7c 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -5,6 +5,8 @@ variables:
 when:
   event: [deployment]
 
+skip_clone: true
+
 steps:
   app-deploy:
     image: deblan/php:8.1
diff --git a/templates/page/simple/projects.html.twig b/templates/page/simple/projects.html.twig
index cc5375a..f7e464a 100644
--- a/templates/page/simple/projects.html.twig
+++ b/templates/page/simple/projects.html.twig
@@ -13,29 +13,27 @@
         </div>
     </div>
 
-    <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
-        {% for project in projects %}
-            <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
-                <div class="card">
-                    {% if project.image %}
-                        <figure>
-                            <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
-                        </figure>
-                    {% endif %}
-                    <div class="card-body">
-                        <h2 class="card-title">{{ project.label }}</h2>
+     <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
+         {% for project in projects %}
+             <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
+                {% if project.image %}
+                    <figure>
+                        <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
+                    </figure>
+                {% endif %}
+                <div class="card-body">
+                    <h2 class="card-title">{{ project.label }}</h2>
 
-                        {{- project.description|murph_url|markdown('post') -}}
+                    {{- project.description|murph_url|markdown('post') -}}
 
-                        <div class="card-actions mt-5">
-                            {% for link in project.links %}
-                                <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
-                                    {{- link.label -}}
-                                </a>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </div>
+                    <div class="card-actions mt-5">
+                        {% for link in project.links %}
+                            <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
+                                {{- link.label -}}
+                            </a>
+                        {% endfor %}
+                     </div>
+                 </div>
             </div>
         {% endfor %}
     </div>

From a273a9aac17c87fe0f719613972d4b33a8aa5ce7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Wed, 18 Oct 2023 22:07:20 +0200
Subject: [PATCH 2/5] update deploy step

---
 .woodpecker/deploy.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index d84cf7c..f00577f 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -1,6 +1,6 @@
 variables:
   - &volumes
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [deployment]
@@ -9,19 +9,17 @@ skip_clone: true
 
 steps:
   app-deploy:
-    image: deblan/php:8.1
+    image: deblan/mage
     secrets: [ssh_user, ssh_host, ssh_priv_key, app_directory]
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync openssh-client
-      - cd "/data/deblan/deblan.io-murph/$CI_COMMIT_SHA"
+      - cd "/builds/$CI_COMMIT_SHA"
       - mkdir "$HOME/.ssh"
       - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
       - chmod 700 "$HOME/.ssh"
       - chmod 600 "$HOME/.ssh/id_ed25519"
-      - composer global require andres-montanez/magallanes
       - cp .mage.yml.dist .mage.yml
       - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
       - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
       - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
-      - /root/.config/composer/vendor/bin/mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
+      -mage deploy "$CI_PIPELINE_DEPLOY_TARGET"

From bbb1804f31acdf2cf551c6ff865fd6830ec820cc Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Wed, 18 Oct 2023 22:07:55 +0200
Subject: [PATCH 3/5] update deploy step

---
 .woodpecker/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index f00577f..b9b25bc 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -22,4 +22,4 @@ steps:
       - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
       - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
       - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
-      -mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
+      - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"

From 7800a014992893e83c4aafdd4787287f649c6c58 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Wed, 18 Oct 2023 22:16:10 +0200
Subject: [PATCH 4/5] update build step

---
 .woodpecker/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 3150dfb..841819d 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -1,7 +1,7 @@
 variables:
   - &volumes
     - node16_cache:/root/.npm
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [push, pull_request, tag, manual]
@@ -71,7 +71,7 @@ steps:
     volumes: *volumes
     commands:
       - apt-get update && apt-get -y install rsync
-      - cd /data/deblan/deblan.io-murph/
+      - cd /builds
       - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"
 
 services:

From 1f9161feef45df0063b42a1ff0c4d2ddc4d0894e Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Wed, 18 Oct 2023 22:17:06 +0200
Subject: [PATCH 5/5] update build step

---
 .woodpecker/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 841819d..fa81891 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -67,10 +67,9 @@ steps:
     failure: ignore
 
   cache-build:
-    image: deblan/php:8.1
+    image: deblan/mage
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync
       - cd /builds
       - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"