From 41c5518d987490cf6366aebbc3b86707ce326cb4 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 31 Mar 2025 14:29:33 +0200 Subject: [PATCH 1/9] Added .yml file to trigger test runs in e2e test repo --- .github/workflows/test-trigger.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/test-trigger.yml diff --git a/.github/workflows/test-trigger.yml b/.github/workflows/test-trigger.yml new file mode 100644 index 000000000..49192b4ad --- /dev/null +++ b/.github/workflows/test-trigger.yml @@ -0,0 +1,25 @@ +name: Trigger E2E tests + +on: + push: + branches: [ staging ] + +jobs: + trigger: + runs-on: ubuntu-latest + + steps: + - name: Trigger E2E test run - local and remote + run: | + # Set the required variables + repo_owner="cryptpad" + repo_name="e2e-test-suite" + event_type="trigger-e2e-tests" + + curl -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.TEST_PAT }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/cryptpad/e2e-test-suite/dispatches \ + -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"service\": \"$service\", \"version\": \"$version\", \"unit\": false, \"integration\": true}}" \ No newline at end of file From b2f9b482cd425bfc7f19cf709e07aae2337eda6e Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 31 Mar 2025 14:32:31 +0200 Subject: [PATCH 2/9] Removed redundant comment --- .github/workflows/test-trigger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-trigger.yml b/.github/workflows/test-trigger.yml index 49192b4ad..ca4c22f25 100644 --- a/.github/workflows/test-trigger.yml +++ b/.github/workflows/test-trigger.yml @@ -11,7 +11,6 @@ jobs: steps: - name: Trigger E2E test run - local and remote run: | - # Set the required variables repo_owner="cryptpad" repo_name="e2e-test-suite" event_type="trigger-e2e-tests" From 2c73fd43182697e661b8bc598a1963501e11f31e Mon Sep 17 00:00:00 2001 From: patpro Date: Thu, 1 May 2025 19:14:12 +0200 Subject: [PATCH 3/9] fix typo in shebang of rc.d-cryptpad missing # in shebang --- docs/rc.d-cryptpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rc.d-cryptpad b/docs/rc.d-cryptpad index b32539d51..411a59bbe 100644 --- a/docs/rc.d-cryptpad +++ b/docs/rc.d-cryptpad @@ -1,4 +1,4 @@ -!/bin/sh +#!/bin/sh # $FreeBSD$ # PROVIDE: cryptpad # REQUIRE: DAEMON nginx From a68b99b8419b1df6eae1b33ad3739cf1d6949976 Mon Sep 17 00:00:00 2001 From: Mathilde <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Wed, 4 Jun 2025 09:42:09 +0200 Subject: [PATCH 4/9] Add latest version to bug_resolution.yml Remove 2024.9.x ones --- .github/ISSUE_TEMPLATE/bug_resolution.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.yml b/.github/ISSUE_TEMPLATE/bug_resolution.yml index 2d6e98cb5..e1dcdea3b 100644 --- a/.github/ISSUE_TEMPLATE/bug_resolution.yml +++ b/.github/ISSUE_TEMPLATE/bug_resolution.yml @@ -89,10 +89,9 @@ body: label: Version description: What version of CryptPad are you running? options: + - 2025.3.1 - 2025.3.0 - 2024.12.0 - - 2024.9.1 - - 2024.9.0 - Other validations: required: true From 679964779368957497d8bcb35385392966a899d2 Mon Sep 17 00:00:00 2001 From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Fri, 6 Jun 2025 11:14:54 +0200 Subject: [PATCH 5/9] update docker-compose for latest image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 84ffc0e1b..cb08362be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ --- services: cryptpad: - image: "cryptpad/cryptpad:version-2025.3.0" + image: "cryptpad/cryptpad:version-2025.3.1" hostname: cryptpad environment: From 00c1ab17d51c1560ee6ab8b68c7d8d4ac47cfbd9 Mon Sep 17 00:00:00 2001 From: Zuzanna Date: Tue, 17 Jun 2025 12:28:01 +0200 Subject: [PATCH 6/9] Trailing newline --- .github/workflows/test-trigger.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-trigger.yml b/.github/workflows/test-trigger.yml index ca4c22f25..2aa829c28 100644 --- a/.github/workflows/test-trigger.yml +++ b/.github/workflows/test-trigger.yml @@ -21,4 +21,5 @@ jobs: -H "Authorization: Bearer ${{ secrets.TEST_PAT }}" \ -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/cryptpad/e2e-test-suite/dispatches \ - -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"service\": \"$service\", \"version\": \"$version\", \"unit\": false, \"integration\": true}}" \ No newline at end of file + -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"service\": \"$service\", \"version\": \"$version\", \"unit\": false, \"integration\": true}}" + \ No newline at end of file From 54356736529fce860532976d67a5077c0e98c286 Mon Sep 17 00:00:00 2001 From: Zuzanna Date: Tue, 17 Jun 2025 13:13:16 +0200 Subject: [PATCH 7/9] Trailing newline --- .github/workflows/test-trigger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-trigger.yml b/.github/workflows/test-trigger.yml index 2aa829c28..db489705c 100644 --- a/.github/workflows/test-trigger.yml +++ b/.github/workflows/test-trigger.yml @@ -22,4 +22,3 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/cryptpad/e2e-test-suite/dispatches \ -d "{\"event_type\": \"$event_type\", \"client_payload\": {\"service\": \"$service\", \"version\": \"$version\", \"unit\": false, \"integration\": true}}" - \ No newline at end of file From eb9de73bd68c1f7648562e8f9b6fe338ffff7372 Mon Sep 17 00:00:00 2001 From: Mathilde <156299270+mathilde-cryptpad@users.noreply.github.com> Date: Wed, 2 Jul 2025 10:54:58 +0200 Subject: [PATCH 8/9] Update bug_resolution.yml Add 2025 summer release version number --- .github/ISSUE_TEMPLATE/bug_resolution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.yml b/.github/ISSUE_TEMPLATE/bug_resolution.yml index e1dcdea3b..100176d93 100644 --- a/.github/ISSUE_TEMPLATE/bug_resolution.yml +++ b/.github/ISSUE_TEMPLATE/bug_resolution.yml @@ -89,9 +89,9 @@ body: label: Version description: What version of CryptPad are you running? options: + - 2025.6.0 - 2025.3.1 - 2025.3.0 - - 2024.12.0 - Other validations: required: true From ae5da10f8dad9d07a90751b8069f7ea101409a7c Mon Sep 17 00:00:00 2001 From: David Benque Date: Wed, 9 Jul 2025 16:51:42 +0100 Subject: [PATCH 9/9] Add license information --- .github/workflows/test-trigger.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-trigger.yml b/.github/workflows/test-trigger.yml index db489705c..3182e7807 100644 --- a/.github/workflows/test-trigger.yml +++ b/.github/workflows/test-trigger.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2025 2023 XWiki CryptPad Team and contributors +# +# SPDX-License-Identifier: AGPL-3.0-or-later + name: Trigger E2E tests on: