Merge branch 'dev' into release-please--branches--dev

pressbooks · May 22, 2024 · 7c24ff3 · 7c24ff3
2 parents f4b51b0 + 44be243
commit 7c24ff3
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 18 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   translations:
     if: github.actor == 'pressbooks-ops' || github.actor == 'transifex-integration[bot]' || github.actor == 'dependabot[bot]'
-    uses: pressbooks/reusable-workflows/.github/workflows/auto-merge.yml@test-tag-release
+    uses: pressbooks/reusable-workflows/.github/workflows/auto-merge.yml@main
     with:
       pr_title_pattern: '^(chore\((l10n|i18n)\):)'
     secrets: inherit
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -6,5 +6,5 @@ on:
 
 jobs:
   deploy:
-    uses: pressbooks/reusable-workflows/.github/workflows/prepare-release.yml@test-tag-release
+    uses: pressbooks/reusable-workflows/.github/workflows/prepare-release.yml@main
     secrets: inherit
diff --git a/.github/workflows/ensure-npm-build.yml b/.github/workflows/ensure-npm-build.yml
@@ -0,0 +1,11 @@
+name: Npm build ⚙️
+
+on:
+  pull_request:
+    branches: [ dev ]
+    paths:
+      - "src/assets/**/*"
+
+jobs:
+  update-npm-build:
+    uses: pressbooks/reusable-workflows/.github/workflows/npm-build.yml@main
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   plugin-tests:
-    uses: pressbooks/reusable-workflows/.github/workflows/pb-plugin-tests.yml@test-tag-release
+    uses: pressbooks/reusable-workflows/.github/workflows/pb-plugin-tests.yml@main
     secrets: inherit
     with:
       requires_pressbooks: true
@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Trigger Bedrock Updates
         if: github.ref == 'refs/heads/dev'
-        uses: pressbooks/composer-autoupdate-bedrock@chore/add-tag-in-sns-message
+        uses: pressbooks/composer-autoupdate-bedrock@main
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/update-mo.yml b/.github/workflows/update-mo.yml
@@ -9,4 +9,4 @@ on:
 
 jobs:
   update-mo-files:
-    uses: pressbooks/reusable-workflows/.github/workflows/update-mo.yml@test-tag-release
+    uses: pressbooks/reusable-workflows/.github/workflows/update-mo.yml@main
diff --git a/.github/workflows/update-pot.yml b/.github/workflows/update-pot.yml
@@ -6,14 +6,13 @@ on:
     paths:
       - '**.php'
       - '**.js'
-  workflow_dispatch:
-
 jobs:
   update-pot-file:
-    uses: pressbooks/reusable-workflows/.github/workflows/update-pot.yml@test-tag-release
+    uses: pressbooks/reusable-workflows/.github/workflows/update-pot.yml@fix/pot-trigger
     secrets: inherit
     with:
       domain: 'pressbooks-fake-plugin'
       slug: 'pressbooks-fake-plugin'
       package_name: 'Pressbooks Fake Plugin'
       headers: '{"Report-Msgid-Bugs-To": "https://github.com/pressbooks/fake-plugin/issues"}'
+      pull_request_number: ${{ github.event.pull_request.number }}
diff --git a/languages/es_ES.mo b/languages/es_ES.mo
diff --git a/languages/es_ES.po b/languages/es_ES.po
@@ -6,9 +6,9 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Pressbooks Fake Plugin 1.9.0\n"
+"Project-Id-Version: Pressbooks Fake Plugin 1.9.6\n"
 "Report-Msgid-Bugs-To: https://github.com/pressbooks/fake-plugin/issues\n"
-"POT-Creation-Date: 2024-05-16T19:24:10+00:00\n"
+"POT-Creation-Date: 2024-05-22T23:45:05+00:00\n"
 "PO-Revision-Date: 2024-04-16 22:27+0000\n"
 "Last-Translator: Felipe Dalcin, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/pressbooks/teams/9194/es/)\n"
@@ -46,8 +46,8 @@ msgid "Hello, people!"
 msgstr ""
 
 #: src/App.php:14
-msgid "Hello, world!"
-msgstr "Hola, mundo!"
+msgid "Hello, world 2!"
+msgstr ""
 
 #: src/App.php:19
 msgid "Hello, bye!"

diff --git a/languages/fake-plugin.pot b/languages/fake-plugin.pot
@@ -40,7 +40,7 @@ msgid "Hello, people!"
 msgstr ""
 
 #: src/App.php:14
-msgid "Hello, world!"
+msgid "Hello, world 2!"
 msgstr ""
 
 #: src/App.php:19

diff --git a/languages/fr_FR.mo b/languages/fr_FR.mo
diff --git a/languages/fr_FR.po b/languages/fr_FR.po
@@ -6,9 +6,9 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Pressbooks Fake Plugin 1.9.0\n"
+"Project-Id-Version: Pressbooks Fake Plugin 1.9.6\n"
 "Report-Msgid-Bugs-To: https://github.com/pressbooks/fake-plugin/issues\n"
-"POT-Creation-Date: 2024-05-16T19:24:10+00:00\n"
+"POT-Creation-Date: 2024-05-22T23:45:05+00:00\n"
 "PO-Revision-Date: 2024-04-16 22:27+0000\n"
 "Last-Translator: Felipe Dalcin, 2024\n"
 "Language-Team: French (https://app.transifex.com/pressbooks/teams/9194/fr/)\n"
@@ -46,8 +46,8 @@ msgid "Hello, people!"
 msgstr ""
 
 #: src/App.php:14
-msgid "Hello, world!"
-msgstr "Bonjour le monde!"
+msgid "Hello, world 2!"
+msgstr ""
 
 #: src/App.php:19
 msgid "Hello, bye!"

diff --git a/src/App.php b/src/App.php
@@ -11,7 +11,7 @@ public function __construct()
 
     public function __toString()
     {
-        return __('Hello, world!', 'pressbooks-fake-plugin');
+        return __('Hello, world 2!', 'pressbooks-fake-plugin');
     }
 
     public function hi()

diff --git a/src/assets/app.css b/src/assets/app.css
@@ -0,0 +1,3 @@
+body{
+	margin: 0;
+}