From 4cd1ef4aa0b2f662b8ee9495b99e3fd2075821e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:27:27 +0100 Subject: [PATCH 01/29] Fix Text Domain Mismatch --- includes/admin/class-health-check.php | 4 ++-- includes/class-settings.php | 6 +++--- includes/class-setup.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/admin/class-health-check.php b/includes/admin/class-health-check.php index 5fa3f9a..daaa0e0 100644 --- a/includes/admin/class-health-check.php +++ b/includes/admin/class-health-check.php @@ -47,7 +47,7 @@ class Health_Check { */ public static function test_event_transformation() { $result = array( - 'label' => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'activitypub' ), + 'label' => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'activitypub-event-bridge' ), 'status' => 'good', 'badge' => array( 'label' => \__( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ), @@ -172,7 +172,7 @@ class Health_Check { 'label' => __( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ), 'fields' => array( 'plugin_version' => array( - 'label' => __( 'Plugin Version', 'activitypub' ), + 'label' => __( 'Plugin Version', 'activitypub-event-bridge' ), 'value' => ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION, 'private' => true, ), diff --git a/includes/class-settings.php b/includes/class-settings.php index 3367dd1..6cd7d2e 100644 --- a/includes/class-settings.php +++ b/includes/class-settings.php @@ -44,7 +44,7 @@ class Settings { 'activitypub_event_bridge_default_event_category', array( 'type' => 'string', - 'description' => \__( 'Define your own custom post template', 'activitypub' ), + 'description' => \__( 'Define your own custom post template', 'activitypub-event-bridge' ), 'show_in_rest' => true, 'default' => self::DEFAULT_EVENT_CATEGORY, 'sanitize_callback' => array( self::class, 'sanitize_mapped_event_category' ), @@ -56,7 +56,7 @@ class Settings { 'activitypub_event_bridge_event_category_mappings', array( 'type' => 'array', - 'description' => \__( 'Define your own custom post template', 'activitypub' ), + 'description' => \__( 'Define your own custom post template', 'activitypub-event-bridge' ), 'default' => array(), 'sanitize_callback' => array( self::class, 'sanitize_event_category_mappings' ), ) @@ -67,7 +67,7 @@ class Settings { 'activitypub_event_bridge_initially_activated', array( 'type' => 'boolean', - 'description' => \__( 'Whether the plugin just got activated for the first time.', 'activitypub' ), + 'description' => \__( 'Whether the plugin just got activated for the first time.', 'activitypub-event-bridge' ), 'default' => 1, ) ); diff --git a/includes/class-setup.php b/includes/class-setup.php index 966d1d3..d919708 100644 --- a/includes/class-setup.php +++ b/includes/class-setup.php @@ -285,7 +285,7 @@ class Setup { foreach ( $this->active_event_plugins as $event_plugin ) { if ( ! in_array( $event_plugin->get_post_type(), $activitypub_supported_post_types, true ) ) { $activitypub_supported_post_types[] = $event_plugin->get_post_type(); - add_post_type_support( $event_plugin->get_post_type(), 'activitypub' ); + add_post_type_support( $event_plugin->get_post_type(), 'activitypub-event-bridge' ); } } update_option( 'activitypub_support_post_types', $activitypub_supported_post_types ); -- 2.39.5 From 557801db33f9c1d5de4463ec20e8af5fddb01957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:28:06 +0100 Subject: [PATCH 02/29] Tested with ActivityPub plugin up to 4.0.1 --- activitypub-event-bridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activitypub-event-bridge.php b/activitypub-event-bridge.php index 1893a17..6cc1afb 100644 --- a/activitypub-event-bridge.php +++ b/activitypub-event-bridge.php @@ -11,7 +11,7 @@ * License URI: https://www.gnu.org/licenses/agpl-3.0.de.html * Requires PHP: 8.1 * - * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 3.3.3. + * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.0.1. * * @package ActivityPub_Event_Bridge * @license AGPL-3.0-or-later -- 2.39.5 From 743d1e13f3e8b1b2420967d43864a6cb40767939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:28:52 +0100 Subject: [PATCH 03/29] Use english license URI in main plugin file --- activitypub-event-bridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activitypub-event-bridge.php b/activitypub-event-bridge.php index 6cc1afb..41557c8 100644 --- a/activitypub-event-bridge.php +++ b/activitypub-event-bridge.php @@ -8,7 +8,7 @@ * Author URI: https://graz.social/@linos * Text Domain: activitypub-event-bridge * License: AGPL-3.0-or-later - * License URI: https://www.gnu.org/licenses/agpl-3.0.de.html + * License URI: https://www.gnu.org/licenses/agpl-3.0.html * Requires PHP: 8.1 * * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.0.1. -- 2.39.5 From 0bed5325931fc7dc374101f813b28044dcd5c0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:41:22 +0100 Subject: [PATCH 04/29] test release workflow --- .distignore | 4 ++-- .forgejo/workflows/release.yml | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .forgejo/workflows/release.yml diff --git a/.distignore b/.distignore index 36a7653..0e17727 100644 --- a/.distignore +++ b/.distignore @@ -1,4 +1,3 @@ -.distignore .git .gitignore .php_cs @@ -31,4 +30,5 @@ readme.md SECURITY.md src tests -vendor \ No newline at end of file +vendor +.distignore \ No newline at end of file diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml new file mode 100644 index 0000000..9f91bab --- /dev/null +++ b/.forgejo/workflows/release.yml @@ -0,0 +1,25 @@ +on: + push: + tags: '*' + +jobs: + upload-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Remove Files Listed in .distignore + run: | + if [ -f .distignore ]; then + while IFS= read -r line; do + if [ -n "$line" ] && [ "${line:0:1}" != "#" ]; then + rm -rf "$line" + fi + done < .distignore + fi + + - uses: actions/forgejo-release@v1 + with: + direction: upload + url: https://code.forgejo.org + release-notes: "MY RELEASE NOTES" -- 2.39.5 From ceeb161ca65add8f631f35e48a71e61ff4ca5a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:43:49 +0100 Subject: [PATCH 05/29] fix actions links --- .forgejo/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 9f91bab..54b97f3 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -6,7 +6,7 @@ jobs: upload-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: https://code.forgejo.org/actions/checkout@v4 - name: Remove Files Listed in .distignore run: | @@ -18,7 +18,7 @@ jobs: done < .distignore fi - - uses: actions/forgejo-release@v1 + - uses: https://code.forgejo.org/actions/forgejo-release@v1 with: direction: upload url: https://code.forgejo.org -- 2.39.5 From a96ce18524ded835d141d0f9c7667060acd699d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:47:40 +0100 Subject: [PATCH 06/29] add token to release ci --- .forgejo/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 54b97f3..c6f5b3f 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -23,3 +23,4 @@ jobs: direction: upload url: https://code.forgejo.org release-notes: "MY RELEASE NOTES" + token: ${{ env.GITHUB_TOKEN }} -- 2.39.5 From 6b4fb08337ddaad66e377f05ca7e84841877f623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:48:22 +0100 Subject: [PATCH 07/29] use v prefix for release tags --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index c6f5b3f..316ddbe 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -1,6 +1,6 @@ on: push: - tags: '*' + tags: 'v*' jobs: upload-release: -- 2.39.5 From 573c6bfa2acd074f8a8db3be3d658108b15f765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:54:56 +0100 Subject: [PATCH 08/29] use a release token secret --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 316ddbe..30fae08 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -23,4 +23,4 @@ jobs: direction: upload url: https://code.forgejo.org release-notes: "MY RELEASE NOTES" - token: ${{ env.GITHUB_TOKEN }} + token: ${{ secrets.FORGEJO_RELEASE_TOKEN }} -- 2.39.5 From 48a086765b2ca3d9fc7d49a2fd35291321489757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:57:25 +0100 Subject: [PATCH 09/29] test FORGEJO_TOKEN --- .forgejo/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 30fae08..493e99e 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -22,5 +22,4 @@ jobs: with: direction: upload url: https://code.forgejo.org - release-notes: "MY RELEASE NOTES" - token: ${{ secrets.FORGEJO_RELEASE_TOKEN }} + token: ${{ FORGEJO_TOKEN }} -- 2.39.5 From 67ea7f7b8701961ce2688f9589a32e50e5b9e2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 15:58:46 +0100 Subject: [PATCH 10/29] fix typo --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 493e99e..a64495d 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -22,4 +22,4 @@ jobs: with: direction: upload url: https://code.forgejo.org - token: ${{ FORGEJO_TOKEN }} + token: ${{ FORGEJO_TOKEN }} -- 2.39.5 From 08a1172f8074476d087e7d1eea7c8634f9749705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 16:07:04 +0100 Subject: [PATCH 11/29] test release workflow --- .forgejo/workflows/release.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index a64495d..50ab1aa 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -8,18 +8,9 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - name: Remove Files Listed in .distignore - run: | - if [ -f .distignore ]; then - while IFS= read -r line; do - if [ -n "$line" ] && [ "${line:0:1}" != "#" ]; then - rm -rf "$line" - fi - done < .distignore - fi - - - uses: https://code.forgejo.org/actions/forgejo-release@v1 + - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: direction: upload - url: https://code.forgejo.org - token: ${{ FORGEJO_TOKEN }} + url: https://code.event-federation.eu + release-dir: dist/release + release-notes: "MY RELEASE NOTES" -- 2.39.5 From a5f3d632f22c0bc2f049d4adef782530f9dabc0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 16:08:14 +0100 Subject: [PATCH 12/29] test --- .forgejo/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 50ab1aa..d1c748e 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -14,3 +14,4 @@ jobs: url: https://code.event-federation.eu release-dir: dist/release release-notes: "MY RELEASE NOTES" + token: ${{ GITHUB_TOKEN }} -- 2.39.5 From df15c8610f96d6538e3a3340f5325e11cdbfc428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 16:09:46 +0100 Subject: [PATCH 13/29] test --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index d1c748e..61adedd 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -14,4 +14,4 @@ jobs: url: https://code.event-federation.eu release-dir: dist/release release-notes: "MY RELEASE NOTES" - token: ${{ GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} -- 2.39.5 From 6a931e38a414f30ffcbfd03bbdffabf783b710d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 17:02:53 +0100 Subject: [PATCH 14/29] add step tot remove distignore files --- .forgejo/workflows/release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 61adedd..ecc7535 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -8,6 +8,16 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 + - name: Remove Files Listed in .distignore + run: | + if [ -f .distignore ]; then + while IFS= read -r line; do + if [ -n "$line" ] && [ "${line:0:1}" != "#" ]; then + rm -rf "$line" + fi + done < .distignore + fi + - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: direction: upload -- 2.39.5 From 804a96723336c668292c0d96986ff226e45e8109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 17:31:58 +0100 Subject: [PATCH 15/29] test --- .forgejo/workflows/release.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index ecc7535..3084758 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -9,14 +9,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v4 - name: Remove Files Listed in .distignore - run: | - if [ -f .distignore ]; then - while IFS= read -r line; do - if [ -n "$line" ] && [ "${line:0:1}" != "#" ]; then - rm -rf "$line" - fi - done < .distignore - fi + run: rm -r tests - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: -- 2.39.5 From defeff32c1767fd3b100c9733e5d4f5dfb9abab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 17:50:13 +0100 Subject: [PATCH 16/29] test --- .forgejo/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 3084758..cbf87a3 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -8,10 +8,13 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 + - name: Remove Files Listed in .distignore + run: ls -la + - name: Remove Files Listed in .distignore run: rm -r tests - - uses: https://code.forgejo.org/actions/forgejo-release@v2 + - uses: https://code.forgejo.org/actions/forgejo-release@v2s with: direction: upload url: https://code.event-federation.eu -- 2.39.5 From 7fdf01356c046a07d9da00d6e647a7b896b8e252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 17:51:16 +0100 Subject: [PATCH 17/29] typo --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index cbf87a3..dfca136 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Remove Files Listed in .distignore run: rm -r tests - - uses: https://code.forgejo.org/actions/forgejo-release@v2s + - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: direction: upload url: https://code.event-federation.eu -- 2.39.5 From 0f1dd8be4775a736e744359a76aad270dc02b9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 17:52:29 +0100 Subject: [PATCH 18/29] test --- .forgejo/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index dfca136..097b4c4 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -12,7 +12,10 @@ jobs: run: ls -la - name: Remove Files Listed in .distignore - run: rm -r tests + run: rm -r tests/ + + - name: Remove Files Listed in .distignore + run: ls -la - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: -- 2.39.5 From 4b656c64570803b7acfe3c228029888365c8581f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:35:21 +0100 Subject: [PATCH 19/29] test --- .forgejo/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 097b4c4..dc2935c 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -17,6 +17,12 @@ jobs: - name: Remove Files Listed in .distignore run: ls -la + - name: Create Release Directory + run: mkdir -p dist/release + + - name: Move Release Files + run: mv * dist/release + - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: direction: upload -- 2.39.5 From d5465a3551833d5ead7556313c5586b1917d7d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:37:05 +0100 Subject: [PATCH 20/29] test --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index dc2935c..94d5ec9 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: mkdir -p dist/release - name: Move Release Files - run: mv * dist/release + run: shopt -s extglob && mv !(dist) dist/release - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: -- 2.39.5 From 9d3f439edccf68b9beefb3e40b4e0caacdc26811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:37:41 +0100 Subject: [PATCH 21/29] test --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 94d5ec9..9129db9 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: mkdir -p dist/release - name: Move Release Files - run: shopt -s extglob && mv !(dist) dist/release + run: 'shopt -s extglob && mv !(dist) dist/release' - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: -- 2.39.5 From 79bf9457447bfb33ffe5ada216a97e06b6fc9009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:39:19 +0100 Subject: [PATCH 22/29] test --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 9129db9..9bbbec6 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: mkdir -p dist/release - name: Move Release Files - run: 'shopt -s extglob && mv !(dist) dist/release' + run: find . -maxdepth 1 -mindepth 1 -not -name dist -exec mv {} dist/release/ \; - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: -- 2.39.5 From b3f7d83bfa375d8ca21828f9d440e6771265d8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:42:10 +0100 Subject: [PATCH 23/29] test --- .forgejo/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 9bbbec6..5b44ee2 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -30,3 +30,4 @@ jobs: release-dir: dist/release release-notes: "MY RELEASE NOTES" token: ${{ secrets.GITHUB_TOKEN }} + repo: Event-Federation/wordpress-activitypub-event-bridge -- 2.39.5 From d1c8a1266bf6a7032e0347f134e6ea72098be1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:43:21 +0100 Subject: [PATCH 24/29] test --- .forgejo/workflows/release.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 5b44ee2..9b5686e 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -8,26 +8,9 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - name: Remove Files Listed in .distignore - run: ls -la - - - name: Remove Files Listed in .distignore - run: rm -r tests/ - - - name: Remove Files Listed in .distignore - run: ls -la - - - name: Create Release Directory - run: mkdir -p dist/release - - - name: Move Release Files - run: find . -maxdepth 1 -mindepth 1 -not -name dist -exec mv {} dist/release/ \; - - uses: https://code.forgejo.org/actions/forgejo-release@v2 with: direction: upload url: https://code.event-federation.eu - release-dir: dist/release release-notes: "MY RELEASE NOTES" token: ${{ secrets.GITHUB_TOKEN }} - repo: Event-Federation/wordpress-activitypub-event-bridge -- 2.39.5 From 2d400918665d5c290282ae60323016e5f5c24ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:43:43 +0100 Subject: [PATCH 25/29] test --- .forgejo/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 9b5686e..6aaf1ad 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -12,5 +12,5 @@ jobs: with: direction: upload url: https://code.event-federation.eu - release-notes: "MY RELEASE NOTES" + release-notes: ${{ TAG }} token: ${{ secrets.GITHUB_TOKEN }} -- 2.39.5 From 898a6baf7ccdd58e352058026f4163870d6edc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:54:06 +0100 Subject: [PATCH 26/29] test --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9d9092a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/tests export-ignore +/bin export-ignore -- 2.39.5 From 1c67f7a33876d9c9c2075102fd70c8b93dbd5559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 20:58:59 +0100 Subject: [PATCH 27/29] test --- .distignore | 10 ---------- .gitattributes | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.distignore b/.distignore index 0e17727..799dca4 100644 --- a/.distignore +++ b/.distignore @@ -1,11 +1,7 @@ .git .gitignore -.php_cs -.svnignore .wordpress-org .wp-env.json -_config.yml -_site bin CHANGELOG.md CODE_OF_CONDUCT.md @@ -13,21 +9,15 @@ composer.json composer.lock Dockerfile docs -docker-compose-test.yml docker-compose.yml FEDERATION.md Gruntfile.js -Makefile node_modules -npm-debug.log package-lock.json package.json phpcs.xml phpunit.xml -phpunit.xml.dist README.md -readme.md -SECURITY.md src tests vendor diff --git a/.gitattributes b/.gitattributes index 9d9092a..7ec1984 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,22 @@ -/tests export-ignore -/bin export-ignore +.gitignore export-ignore +.wp-env.json export-ignore +bin export-ignore +CHANGELOG.md export-ignore +CODE_OF_CONDUCT.md export-ignore +composer.json export-ignore +composer.lock export-ignore +Dockerfile export-ignore +docs export-ignore +docker-compose.yml export-ignore +FEDERATION.md export-ignore +Gruntfile.js export-ignore +node_modules export-ignore +package-lock.json export-ignore +package.json export-ignore +phpcs.xml export-ignore +phpunit.xml export-ignore +README.md export-ignore +src export-ignore +tests export-ignore +vendor export-ignore +.distignore export-ignore -- 2.39.5 From c75e1307dfea79c911b95e33f853c7eb6bbc78da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 21:00:34 +0100 Subject: [PATCH 28/29] test --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 7ec1984..ff04d41 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,3 +20,5 @@ src export-ignore tests export-ignore vendor export-ignore .distignore export-ignore +.forgejo export-ignore +.gitattributes export-ignore -- 2.39.5 From 40f5bdc94b8f15ec73302db48408bcfbae38fead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 29 Oct 2024 21:06:12 +0100 Subject: [PATCH 29/29] test --- .distignore | 6 +++--- .gitattributes | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.distignore b/.distignore index 799dca4..471f8fb 100644 --- a/.distignore +++ b/.distignore @@ -1,3 +1,4 @@ +.distignore .git .gitignore .wordpress-org @@ -7,18 +8,17 @@ CHANGELOG.md CODE_OF_CONDUCT.md composer.json composer.lock +docker-compose.yml Dockerfile docs -docker-compose.yml FEDERATION.md Gruntfile.js node_modules -package-lock.json package.json +package-lock.json phpcs.xml phpunit.xml README.md src tests vendor -.distignore \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index ff04d41..ae639c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,24 +1,23 @@ +.distignore export-ignore +.forgejo export-ignore +.gitattributes export-ignore .gitignore export-ignore .wp-env.json export-ignore bin export-ignore -CHANGELOG.md export-ignore CODE_OF_CONDUCT.md export-ignore composer.json export-ignore composer.lock export-ignore +docker-compose.yml export-ignore Dockerfile export-ignore docs export-ignore -docker-compose.yml export-ignore FEDERATION.md export-ignore Gruntfile.js export-ignore node_modules export-ignore -package-lock.json export-ignore package.json export-ignore +package-lock.json export-ignore phpcs.xml export-ignore phpunit.xml export-ignore README.md export-ignore src export-ignore tests export-ignore vendor export-ignore -.distignore export-ignore -.forgejo export-ignore -.gitattributes export-ignore -- 2.39.5