From 5ca4c204db548d1b6bf6e700720b90e716e90fa3 Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 08:48:36 +0000 Subject: [PATCH 1/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index a21d1a60..c3927a4c 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -3,7 +3,7 @@ on: push: branches: - main - - feature/sse-connect + - dev jobs: test: From 0e392db5bda28f4f4ffcc44f388cc56ff8b9e79a Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 08:57:19 +0000 Subject: [PATCH 2/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index c3927a4c..356af9cd 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -30,14 +30,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: update authorizer_password_reset - uses: jlepocher/mailgun-create-template-version-action@v1.3 + + - name: update authorizer_password_reset template + uses: gyto/mailgun-template-action@v2 with: - mailgun-host: 'api.eu.mailgun.net' - mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} - mailgun-domain-name: 'discours.io' - mailgun-template-name: 'authorizer_password_reset' - html-file-path: './templates/authorizer_password_reset.html' + html-file: './templates/authorizer_password_reset.html' + mailgun-api-key: ${{ secrets.MAILGUN_KEY }} + mailgun-domain: "discours.io", + mailgun-template: "authorizer_password_reset" - name: update authorizer_password_reset uses: jlepocher/mailgun-create-template-version-action@v1.3 From 09417a12e412981e90992830e79fc793da3f0b2c Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 08:58:57 +0000 Subject: [PATCH 3/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 356af9cd..be43d562 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -34,16 +34,7 @@ jobs: - name: update authorizer_password_reset template uses: gyto/mailgun-template-action@v2 with: - html-file: './templates/authorizer_password_reset.html' + html-file: "./templates/authorizer_password_reset.html" mailgun-api-key: ${{ secrets.MAILGUN_KEY }} mailgun-domain: "discours.io", mailgun-template: "authorizer_password_reset" - - - name: update authorizer_password_reset - uses: jlepocher/mailgun-create-template-version-action@v1.3 - with: - mailgun-host: 'api.eu.mailgun.net' - mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} - mailgun-domain-name: 'discours.io' - mailgun-template-name: 'authorizer_email_confirm' - html-file-path: './templates/authorizer_email_confirm.html' From a7246cf9591f190d12b67011c3874558b7e2b20d Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 09:00:39 +0000 Subject: [PATCH 4/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index be43d562..85dd7801 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: update authorizer_password_reset template + - name: "Create password reset template" uses: gyto/mailgun-template-action@v2 with: html-file: "./templates/authorizer_password_reset.html" From f2fd539d01f474a5f9ee98f1302e684f07b41eab Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 09:01:16 +0000 Subject: [PATCH 5/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 85dd7801..caf313bd 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -31,10 +31,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: "Create password reset template" + - name: Password-reset-template uses: gyto/mailgun-template-action@v2 with: html-file: "./templates/authorizer_password_reset.html" mailgun-api-key: ${{ secrets.MAILGUN_KEY }} - mailgun-domain: "discours.io", + mailgun-domain: "discours.io" mailgun-template: "authorizer_password_reset" From e9bcb841a21e085d741ee241f009c36fc07600fc Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 09:04:35 +0000 Subject: [PATCH 6/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index caf313bd..5fbbdcf7 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -35,6 +35,6 @@ jobs: uses: gyto/mailgun-template-action@v2 with: html-file: "./templates/authorizer_password_reset.html" - mailgun-api-key: ${{ secrets.MAILGUN_KEY }} + mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} mailgun-domain: "discours.io" mailgun-template: "authorizer_password_reset" From c6e9a5e9503a60355df5dc6054e8d2327229f6f2 Mon Sep 17 00:00:00 2001 From: to Date: Thu, 1 Feb 2024 09:18:09 +0000 Subject: [PATCH 7/7] Update .gitea/workflows/main.yml --- .gitea/workflows/main.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 5fbbdcf7..09c1881b 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -1,9 +1,11 @@ name: 'deploy' + on: push: branches: - main - dev + - feature/email-templates jobs: test: @@ -26,15 +28,40 @@ jobs: update_mailgun_template: runs-on: ubuntu-latest name: Update templates on Mailgun + if: github.event_name == 'push' && github.ref == 'refs/heads/feature/email-templates' continue-on-error: true steps: - name: Checkout uses: actions/checkout@v2 - - name: Password-reset-template + - name: "Email confirmation template" + uses: gyto/mailgun-template-action@v2 + with: + html-file: "./templates/authorizer_email_confirmation.html" + mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} + mailgun-domain: "discours.io" + mailgun-template: "authorizer_email_confirmation" + + - name: "Password reset template" uses: gyto/mailgun-template-action@v2 with: html-file: "./templates/authorizer_password_reset.html" mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} mailgun-domain: "discours.io" mailgun-template: "authorizer_password_reset" + + - name: "First publication notification" + uses: gyto/mailgun-template-action@v2 + with: + html-file: "./templates/first_publication_notification.html" + mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} + mailgun-domain: "discours.io" + mailgun-template: "first_publication_notification" + + - name: "New comment notification template" + uses: gyto/mailgun-template-action@v2 + with: + html-file: "./templates/new_comment_notification.html" + mailgun-api-key: ${{ secrets.MAILGUN_API_KEY }} + mailgun-domain: "discours.io" + mailgun-template: "new_comment_notification"