From cece051de6d6581f622e41293f63c314e6afafcc Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Sun, 22 Dec 2024 23:40:09 +0100 Subject: [PATCH 1/8] fix(association): remove duplicate title --- .forgejo/workflows/hugo.yaml | 1 + content/association/commissions.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index 8abdc48..d8fd7d3 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -18,6 +18,7 @@ jobs: - name: Set baseURL shell: /bin/bash run: | + >&2 echo "6de2fec7-1b8f-4514-96c1-3ca55f4a8fa1" if [[ "${{ env.github_ref_name }}" == "master" ]]; then echo "Using master config" echo -n "https://etoiledebethleem.fr" > /base_url.txt diff --git a/content/association/commissions.md b/content/association/commissions.md index d22932d..9c6ff36 100644 --- a/content/association/commissions.md +++ b/content/association/commissions.md @@ -1,11 +1,10 @@ --- title: Les commissions --- -# Les commissions de l’association L’association L’Étoile de Bethléem a structuré ses activités en différentes commissions afin de répondre efficacement aux besoins variés liés à la sauvegarde et à la valorisation de la chapelle. -## Nos commissions : +## Nos commissions - **Travaux** *Responsable : Corentin Boulard* @@ -30,6 +29,7 @@ L’association L’Étoile de Bethléem a structuré ses activités en différe Identification et mise en œuvre de collaborations avec des artisans et acteurs locaux. ## Rejoignez-nous ! + Si vous souhaitez apporter votre aide à l’une de ces commissions, contactez-nous à l’adresse suivante : [contact@etoiledebethleem.fr](mailto:contact@etoiledebethleem.fr). -- 2.45.2 From 1e2e073e6207800f88f5a5f7703dadac194f602e Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Sun, 22 Dec 2024 23:53:37 +0100 Subject: [PATCH 2/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index d8fd7d3..84263d0 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -8,6 +8,8 @@ on: branches: - master - develop + pull_request: + types: [opened, synchronize, reopened] jobs: deploy: -- 2.45.2 From 74b8a34ba28bd9942473af42f5d76c92ccb12611 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Sun, 22 Dec 2024 23:59:23 +0100 Subject: [PATCH 3/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index 84263d0..36307ac 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -18,8 +18,9 @@ jobs: image: code.forgejo.org/oci/node:20-bookworm steps: - name: Set baseURL - shell: /bin/bash + shell: /usr/bin/bash run: | + echo "WOWOWOWOWOWOW" >&2 echo "6de2fec7-1b8f-4514-96c1-3ca55f4a8fa1" if [[ "${{ env.github_ref_name }}" == "master" ]]; then echo "Using master config" -- 2.45.2 From 42d24874b2ce1a39c30fcab3e72461f4b8dc95e2 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Mon, 23 Dec 2024 00:00:28 +0100 Subject: [PATCH 4/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index 36307ac..7608743 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -32,6 +32,8 @@ jobs: fi ls / cat /base_url.txt + - name: Install rsync + run: echo "${{ env.github_ref_name }}" - name: Install rsync run: apt update && apt install -y rsync - uses: actions/checkout@v4 -- 2.45.2 From 4e6033b7843856e5e7986fb314d03b379f2505c7 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Mon, 23 Dec 2024 00:01:39 +0100 Subject: [PATCH 5/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index 7608743..b5f7ffd 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -18,10 +18,9 @@ jobs: image: code.forgejo.org/oci/node:20-bookworm steps: - name: Set baseURL - shell: /usr/bin/bash run: | - echo "WOWOWOWOWOWOW" - >&2 echo "6de2fec7-1b8f-4514-96c1-3ca55f4a8fa1" + echo "Checking current branch." + echo -n "https://dev.etoiledebethleem.fr" > /base_url.txt if [[ "${{ env.github_ref_name }}" == "master" ]]; then echo "Using master config" echo -n "https://etoiledebethleem.fr" > /base_url.txt @@ -32,7 +31,7 @@ jobs: fi ls / cat /base_url.txt - - name: Install rsync + - name: Debug some vars run: echo "${{ env.github_ref_name }}" - name: Install rsync run: apt update && apt install -y rsync -- 2.45.2 From 6ed4bebdd6b1d8895010999f03bdef33ee7614e7 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Mon, 23 Dec 2024 00:02:28 +0100 Subject: [PATCH 6/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index b5f7ffd..afc1cea 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -17,7 +17,10 @@ jobs: container: image: code.forgejo.org/oci/node:20-bookworm steps: + - name: Install rsync and bash + run: apt update && apt install -y rsync bash - name: Set baseURL + shell: /usr/bin/bash run: | echo "Checking current branch." echo -n "https://dev.etoiledebethleem.fr" > /base_url.txt @@ -31,10 +34,6 @@ jobs: fi ls / cat /base_url.txt - - name: Debug some vars - run: echo "${{ env.github_ref_name }}" - - name: Install rsync - run: apt update && apt install -y rsync - uses: actions/checkout@v4 with: submodules: true -- 2.45.2 From 9fbf62b0975d19c7ac3048360ed8889641de9c63 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Mon, 23 Dec 2024 00:06:06 +0100 Subject: [PATCH 7/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index afc1cea..4b699d6 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -20,19 +20,20 @@ jobs: - name: Install rsync and bash run: apt update && apt install -y rsync bash - name: Set baseURL - shell: /usr/bin/bash run: | echo "Checking current branch." echo -n "https://dev.etoiledebethleem.fr" > /base_url.txt - if [[ "${{ env.github_ref_name }}" == "master" ]]; then + if [ "${{ env.github_ref_name }}" = "master" ] + then echo "Using master config" echo -n "https://etoiledebethleem.fr" > /base_url.txt fi - if [[ "${{ env.github_ref_name }}" == "develop" ]]; then + if [ "${{ env.github_ref_name }}" = "develop" ] + then echo "Using develop config" echo -n "https://preview.etoiledebethleem.fr" > /base_url.txt fi - ls / + ls -la /base_url.txt cat /base_url.txt - uses: actions/checkout@v4 with: -- 2.45.2 From d6323b36c2a78791bcf8d2f70e4ff15debf015b8 Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Mon, 23 Dec 2024 00:13:23 +0100 Subject: [PATCH 8/8] test forgejo action bash --- .forgejo/workflows/hugo.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/hugo.yaml b/.forgejo/workflows/hugo.yaml index 4b699d6..33ac1c4 100644 --- a/.forgejo/workflows/hugo.yaml +++ b/.forgejo/workflows/hugo.yaml @@ -62,8 +62,14 @@ jobs: REMOTE_USER: forgejo_actions_websites SRV_HOST: srv06.lefuturiste.fr run: | - rsync --perms --archive --stats \ - -e 'ssh -i ~/.ssh/id_edsa -o StrictHostKeyChecking=no' ./public \ - $REMOTE_USER@$SRV_HOST:$OUTPUT_PATH$GITHUB_REF_NAME + if [ "${{ env.github_ref_name }}" = "master" ] || [ "${{ env.github_ref_name }}" = "develop" ] + then + echo "Deploying to $REMOTE_USER@$SRV_HOST:$OUTPUT_PATH$GITHUB_REF_NAME" + rsync --perms --archive --stats \ + -e 'ssh -i ~/.ssh/id_edsa -o StrictHostKeyChecking=no' ./public \ + $REMOTE_USER@$SRV_HOST:$OUTPUT_PATH$GITHUB_REF_NAME + else + echo "Deployment skipped." + fi -- 2.45.2