From f0cb277cdfba3d708484749bef531997d5c29b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 09:55:10 +0100 Subject: [PATCH 1/7] Add CI for deployments to WordPress.org --- .forgejo/workflows/assets.yml | 21 +++++++++++++++++++++ .forgejo/workflows/deploy.yml | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 .forgejo/workflows/assets.yml create mode 100644 .forgejo/workflows/deploy.yml diff --git a/.forgejo/workflows/assets.yml b/.forgejo/workflows/assets.yml new file mode 100644 index 0000000..b278404 --- /dev/null +++ b/.forgejo/workflows/assets.yml @@ -0,0 +1,21 @@ +name: Plugin asset/readme update on WordPress.org + +on: + push: + branches: + - main + +jobs: + trunk: + name: Push assets to trunk on WordPress.org + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: https://code.forgejo.org/actions/checkout@v4 + + - name: WordPress.org plugin asset/readme update + uses: https://github.com/10up/action-wordpress-plugin-asset-update@stable + env: + SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} + SVN_USERNAME: ${{ secrets.SVN_USERNAME }} + SLUG: event-bridge-for-activitypub diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..01aa83d --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,21 @@ +name: Deploy to WordPress.org + +on: + push: + tags: + - "v*" + +jobs: + tag: + name: New tag + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: https://code.forgejo.org/actions/checkout@v4 + + - name: WordPress Plugin Deploy + uses: https://github.com/10up/action-wordpress-plugin-deploy@stable + env: + SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} + SVN_USERNAME: ${{ secrets.SVN_USERNAME }} + SLUG: event-bridge-for-activitypub -- 2.39.5 From 11e8d48e76d9db29f00ae234d2bd32219bc56fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 09:58:58 +0100 Subject: [PATCH 2/7] remove CHANGELOG.md from .distignore --- .distignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.distignore b/.distignore index 471f8fb..4754d34 100644 --- a/.distignore +++ b/.distignore @@ -4,7 +4,6 @@ .wordpress-org .wp-env.json bin -CHANGELOG.md CODE_OF_CONDUCT.md composer.json composer.lock -- 2.39.5 From 2510f4c1755a59c409424849982ab5b160a3a081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 11:06:59 +0100 Subject: [PATCH 3/7] Add NLnet and NGI-Zero acknoledgements --- .../acknowledgement-NGI0Entrust.svg | 121 ++++++++++++++++++ .wordpress-org/acknowledgement-NLnet.svg | 1 + README.md | 7 + .../event-bridge-for-activitypub-admin.css | 5 + readme.txt | 7 + templates/welcome.php | 12 +- 6 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 .wordpress-org/acknowledgement-NGI0Entrust.svg create mode 100644 .wordpress-org/acknowledgement-NLnet.svg diff --git a/.wordpress-org/acknowledgement-NGI0Entrust.svg b/.wordpress-org/acknowledgement-NGI0Entrust.svg new file mode 100644 index 0000000..0d211b3 --- /dev/null +++ b/.wordpress-org/acknowledgement-NGI0Entrust.svg @@ -0,0 +1,121 @@ + + + +image/svg+xml + + + + + + +NGI Zero Entrust + + + + diff --git a/.wordpress-org/acknowledgement-NLnet.svg b/.wordpress-org/acknowledgement-NLnet.svg new file mode 100644 index 0000000..7980346 --- /dev/null +++ b/.wordpress-org/acknowledgement-NLnet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/README.md b/README.md index 91f11d6..03f9264 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,13 @@ If you know about coding have a look at the documentation of how to add your plu We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues). +## Acknowledgement + +[NLnet foundation logo](https://nlnet.nl) +[NGI Zero Logo](https://nlnet.nl/entrust) + +The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594. + ## Changelog ## ### [0.3.4] 2024-12-21 ### diff --git a/assets/css/event-bridge-for-activitypub-admin.css b/assets/css/event-bridge-for-activitypub-admin.css index 6c62d22..931fb44 100644 --- a/assets/css/event-bridge-for-activitypub-admin.css +++ b/assets/css/event-bridge-for-activitypub-admin.css @@ -9,6 +9,11 @@ margin-bottom: 1.5em; } +.event-bridge-for-activitypub-settings-page .logo-center { + width: 25%; + margin: 10px 5% 10px 5%; +} + .event-bridge-for-activitypub-settings-page .box ul.event-bridge-for-activitypub-list { margin-left: 0.6em; } diff --git a/readme.txt b/readme.txt index 1e444dd..27fd37b 100644 --- a/readme.txt +++ b/readme.txt @@ -93,6 +93,13 @@ If you know about coding have a look at the documentation of how to add your plu We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues). +== Acknowledgement == + +[NLnet foundation logo](https://nlnet.nl) +[NGI Zero Logo](https://nlnet.nl/entrust) + +The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594. + == Changelog == = [0.3.4] 2024-12-21 = diff --git a/templates/welcome.php b/templates/welcome.php index c6c3567..5d6ee0f 100644 --- a/templates/welcome.php +++ b/templates/welcome.php @@ -230,15 +230,13 @@ WP_Filesystem();
-

- 
-			get_contents( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR . '/CHANGELOG.md' );
-			echo esc_html( substr( $changelog, strpos( $changelog, "\n", 180 ) + 1 ) );
-			?>
-
+

+

Logo NLnet: abstract logo of four people seen from above Logo NGI Zero: letterlogo shaped like a tag

+

The development of this plugin was funded through the NGI0 Entrust Fund, a fund established by NLnet with financial support from the European Commission's Next Generation Internet programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 101069594.

+ + -- 2.39.5 From b8121cb299c5786166b9b42dc688672e5018ce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 11:10:53 +0100 Subject: [PATCH 4/7] Fix small bug causing PHP Warning in admin UI --- templates/welcome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/welcome.php b/templates/welcome.php index 5d6ee0f..7134c7e 100644 --- a/templates/welcome.php +++ b/templates/welcome.php @@ -45,8 +45,8 @@ WP_Filesystem(); ⚠' . \wp_kses( $notice, General_Admin_Notices::ALLOWED_HTML ) . '

'; } - echo '

⚠' . \wp_kses( $notice, General_Admin_Notices::ALLOWED_HTML ) . '

'; ?>

get_plugin_name() ); ?>:

-- 2.39.5 From 0bdd9fd7a877b1c427fa88ff62281ca82d2fbce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 11:17:30 +0100 Subject: [PATCH 5/7] CI: fix dependencies for deployment to WordPress.org --- .forgejo/workflows/assets.yml | 6 ++++++ .forgejo/workflows/deploy.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.forgejo/workflows/assets.yml b/.forgejo/workflows/assets.yml index b278404..2541206 100644 --- a/.forgejo/workflows/assets.yml +++ b/.forgejo/workflows/assets.yml @@ -13,6 +13,12 @@ jobs: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 + - name: Install and cache rsync + uses: https://github.com/awalsh128/cache-apt-pkgs-action@latest + with: + packages: rsync subversion + version: 1.0 + - name: WordPress.org plugin asset/readme update uses: https://github.com/10up/action-wordpress-plugin-asset-update@stable env: diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 01aa83d..831bbfb 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -13,6 +13,12 @@ jobs: - name: Checkout uses: https://code.forgejo.org/actions/checkout@v4 + - name: Install and cache rsync + uses: https://github.com/awalsh128/cache-apt-pkgs-action@latest + with: + packages: rsync subversion + version: 1.0 + - name: WordPress Plugin Deploy uses: https://github.com/10up/action-wordpress-plugin-deploy@stable env: -- 2.39.5 From fa842f6a9c5a018a5384eb33ec90720499346822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 11:18:59 +0100 Subject: [PATCH 6/7] phpcs --- assets/css/event-bridge-for-activitypub-admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/event-bridge-for-activitypub-admin.css b/assets/css/event-bridge-for-activitypub-admin.css index 931fb44..2862063 100644 --- a/assets/css/event-bridge-for-activitypub-admin.css +++ b/assets/css/event-bridge-for-activitypub-admin.css @@ -11,7 +11,7 @@ .event-bridge-for-activitypub-settings-page .logo-center { width: 25%; - margin: 10px 5% 10px 5%; + margin: 10px 5% 10px 5%; } .event-bridge-for-activitypub-settings-page .box ul.event-bridge-for-activitypub-list { -- 2.39.5 From 79e337b981c8e7d40165de19c28ccece8b46c466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Tue, 31 Dec 2024 11:44:35 +0100 Subject: [PATCH 7/7] do not use v prefix for version tags --- .forgejo/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 831bbfb..55e9192 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy to WordPress.org on: push: tags: - - "v*" + - "*" jobs: tag: -- 2.39.5