From b96934376a0958afc08573b94df5f7b67bc5cda7 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 00:36:41 +0100 Subject: [PATCH 01/10] Cambiata ancora machinery. --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 828027a..4da4900 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,11 +5,10 @@ name: default steps: - name: Build - image: git.libreitalia.org/libreitalia/site-builder:debian-1.0.2 + image: git.libreitalia.org/libreitalia/site-builder:debian-1.0.0 commands: - . /app/venv/bin/activate - pip install -r /drone/src/requirements.txt - - mkdir /drone/src/output - pelican /drone/src/content -o /drone/src/output -s /drone/src/publishconf.py - name: Deploy From 321c764b5c07febecde1e8896b7d6037e8b021ce Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 00:44:32 +0100 Subject: [PATCH 02/10] Controllo index. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 4da4900..1375efe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,6 +10,7 @@ steps: - . /app/venv/bin/activate - pip install -r /drone/src/requirements.txt - pelican /drone/src/content -o /drone/src/output -s /drone/src/publishconf.py + - cat /drone/src/output/index.html - name: Deploy image: drillster/drone-rsync From be70d7fe5e1eb09fc2b3f6ad3a281f54fccfad8d Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 00:47:33 +0100 Subject: [PATCH 03/10] Pulizia cartelle. --- .drone.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1375efe..653a471 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,9 +8,9 @@ steps: image: git.libreitalia.org/libreitalia/site-builder:debian-1.0.0 commands: - . /app/venv/bin/activate - - pip install -r /drone/src/requirements.txt - - pelican /drone/src/content -o /drone/src/output -s /drone/src/publishconf.py - - cat /drone/src/output/index.html + - pip install -r requirements.txt + - pelican content -s publishconf.py + - cat output/index.html - name: Deploy image: drillster/drone-rsync @@ -23,14 +23,12 @@ steps: from_secret: conference_port key: from_secret: conference_sshprivkey - source: /drone/src/output + source: output target: /var/www/conference recursive: true script: - "sudo chown root:www-data -R /var/www/conference" -trigger: +triggers: event: - - custom - push - - pull_request From f9b84b87393d3f7c737112741c53f84c376291d7 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 00:48:44 +0100 Subject: [PATCH 04/10] Correzione percorso sorgente. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 653a471..9f1ae3e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: from_secret: conference_port key: from_secret: conference_sshprivkey - source: output + source: output/ target: /var/www/conference recursive: true script: From b14c0cf1b13374088117fc4da4e150f7bcc32c93 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 00:53:20 +0100 Subject: [PATCH 05/10] Cambio immagine build, tornata alpine. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9f1ae3e..1b7e824 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: default steps: - name: Build - image: git.libreitalia.org/libreitalia/site-builder:debian-1.0.0 + image: git.libreitalia.org/libreitalia/site-builder:1.0.0 commands: - . /app/venv/bin/activate - pip install -r requirements.txt From 66d3307980cbe93ae0a458bcf970f02df0a4aed9 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 01:26:27 +0100 Subject: [PATCH 06/10] Test deploying actions. --- .drone.yml | 7 ++++--- .gitea/workflows/build-deploy.yml | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .gitea/workflows/build-deploy.yml diff --git a/.drone.yml b/.drone.yml index 1b7e824..aa4b017 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- kind: pipeline type: docker -name: default +name: build-and-deploy steps: - name: Build @@ -10,7 +10,6 @@ steps: - . /app/venv/bin/activate - pip install -r requirements.txt - pelican content -s publishconf.py - - cat output/index.html - name: Deploy image: drillster/drone-rsync @@ -29,6 +28,8 @@ steps: script: - "sudo chown root:www-data -R /var/www/conference" -triggers: +trigger: + branch: + - master event: - push diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml new file mode 100644 index 0000000..8019e0c --- /dev/null +++ b/.gitea/workflows/build-deploy.yml @@ -0,0 +1,24 @@ +--- +name: Build and Deploy +on: [push] +jobs: + Build: + runs-on: site-builder + steps: + - run: . /app/venv/bin/activate + - run: pip install -r requirements.txt + - run: pelican content -s publishconf.py + + Deploy: + runs-on: debian-bookworm + steps: + - uses: easingthemes/ssh-deploy@main + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SOURCE: output/ + REMOTE_HOST: ${{ secrets.REMOTE_HOST }} + REMOTE_USER: ${{ secrets.REMOTE_USER }} + REMOTE_PORT: ${{ secrets.REMOTE_PORT }} + TARGET: /var/www/conference + SCRIPT_AFTER: | + sudo chown -R root:www-data /var/www/conference From ce72b462590177c0d2b810571c44d3e1bebdd483 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 01:36:11 +0100 Subject: [PATCH 07/10] Pulito readme. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8dd334c..469b2fd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://dli.sys42.cc/api/badges/libreitalia/conference-site/status.svg)](https://dli.sys42.cc/libreitalia/conference-site) - # Sito web delle conferenze LibreItalia # ### Istruzioni per lo sviluppo ### From c06e5a3663063612c10a6d2444b02910a8c7e582 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 01:49:08 +0100 Subject: [PATCH 08/10] Rimosso pipeline drone. --- .drone.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index aa4b017..0000000 --- a/.drone.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -kind: pipeline -type: docker -name: build-and-deploy - -steps: - - name: Build - image: git.libreitalia.org/libreitalia/site-builder:1.0.0 - commands: - - . /app/venv/bin/activate - - pip install -r requirements.txt - - pelican content -s publishconf.py - - - name: Deploy - image: drillster/drone-rsync - settings: - hosts: - from_secret: conference_hostname - user: - from_secret: conference_username - port: - from_secret: conference_port - key: - from_secret: conference_sshprivkey - source: output/ - target: /var/www/conference - recursive: true - script: - - "sudo chown root:www-data -R /var/www/conference" - -trigger: - branch: - - master - event: - - push From 309cc10b6e1aabad725371656f26897a562239c1 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 01:56:57 +0100 Subject: [PATCH 09/10] =?UTF-8?q?Aggiunta=20site=20packages=20a=20istruzio?= =?UTF-8?q?ni=20build.=C3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 469b2fd..e3a7ea2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ sviluppare in locale il sito, effettuare le seguenti operazioni: ```sh $ git clone https://git.libreitalia.org/libreitalia/conference-site $ cd conference-site -$ python3 -m venv venv +$ python3 -m venv venv --system-site-packages $ source venv/bin/activate $ pip install -r requirements.txt $ make devserver From 350ce7f4e2b946d1ebb65594b274e8c72aad8ef2 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 2 Mar 2024 02:01:38 +0100 Subject: [PATCH 10/10] Piccolo fix a README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3a7ea2..469d5e6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Il sito รจ costruito con [Pelican](https://getpelican.com/). Per poter sviluppare in locale il sito, effettuare le seguenti operazioni: -```sh +```bash $ git clone https://git.libreitalia.org/libreitalia/conference-site $ cd conference-site $ python3 -m venv venv --system-site-packages