From 1de1631386bb57febcd3a1b307eb9f6e3e9ef8cb Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:03:12 +1300 Subject: [PATCH 1/4] ENH Make UI strings translatable (#68) Also add to transifex. --- .tx/config | 9 +++++++++ lang/_manifest_exclude | 0 lang/en.yml | 4 ++++ src/Extensions/ComposerUpdateExtension.php | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .tx/config create mode 100644 lang/_manifest_exclude create mode 100644 lang/en.yml diff --git a/.tx/config b/.tx/config new file mode 100644 index 0000000..e691dfa --- /dev/null +++ b/.tx/config @@ -0,0 +1,9 @@ +[main] +host = https://www.transifex.com + +[o:silverstripe:p:silverstripe-composer-update-checker:r:master] +file_filter = lang/.yml +source_file = lang/en.yml +source_lang = en +type = YML + diff --git a/lang/_manifest_exclude b/lang/_manifest_exclude new file mode 100644 index 0000000..e69de29 diff --git a/lang/en.yml b/lang/en.yml new file mode 100644 index 0000000..db60395 --- /dev/null +++ b/lang/en.yml @@ -0,0 +1,4 @@ +en: + BringYourOwnIdeas\Maintenance\Model\Package: + db_AvailableVersion: Available + db_LatestVersion: Latest diff --git a/src/Extensions/ComposerUpdateExtension.php b/src/Extensions/ComposerUpdateExtension.php index e78be8f..010ca46 100644 --- a/src/Extensions/ComposerUpdateExtension.php +++ b/src/Extensions/ComposerUpdateExtension.php @@ -21,8 +21,8 @@ class ComposerUpdateExtension extends DataExtension ]; private static $summary_fields = [ - 'AvailableVersion' => 'Available', - 'LatestVersion' => 'Latest', + 'AvailableVersion', + 'LatestVersion' ]; /** From 45fc82c0d0904c76a689d679329f6b4aa6132537 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 21 Mar 2023 12:02:41 +1300 Subject: [PATCH 2/4] MNT Use gha-dispatch-ci --- .github/workflows/ci.yml | 5 ----- .github/workflows/dispatch-ci.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dispatch-ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21d68ad..bf02210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,8 @@ on: push: pull_request: workflow_dispatch: - # Every Sunday at 4:10pm UTC - schedule: - - cron: '10 16 * * 0' jobs: ci: name: CI - # Only run cron on the bringyourownideas account - if: (github.event_name == 'schedule' && github.repository_owner == 'bringyourownideas') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml new file mode 100644 index 0000000..fe92e5e --- /dev/null +++ b/.github/workflows/dispatch-ci.yml @@ -0,0 +1,16 @@ +name: Dispatch CI + +on: + # At 4:10 PM UTC, only on Sunday and Monday + schedule: + - cron: '10 16 * * 0,1' + +jobs: + dispatch-ci: + name: Dispatch CI + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Dispatch CI + uses: silverstripe/gha-dispatch-ci@v1 From 933a37d1764755cd62fe8e49ee3d3f91a1a84121 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:11:09 +1300 Subject: [PATCH 3/4] MNT Revert erroneous dependency changes (#70) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e67095c..abc97e7 100644 --- a/composer.json +++ b/composer.json @@ -34,8 +34,8 @@ "require": { "php": "^7.4 || ^8.0", "composer/composer": "^2", - "silverstripe/framework": "^4.10", - "bringyourownideas/silverstripe-maintenance": "^2" + "silverstripe/framework": "4.13.x-dev", + "bringyourownideas/silverstripe-maintenance": "2.7.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 979b4fbbad9c41fd845f9e4a8c1e5988aea53d4f Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:26:08 +1300 Subject: [PATCH 4/4] MNT Fix dependencies (#71) --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index abc97e7..227056c 100644 --- a/composer.json +++ b/composer.json @@ -34,8 +34,8 @@ "require": { "php": "^7.4 || ^8.0", "composer/composer": "^2", - "silverstripe/framework": "4.13.x-dev", - "bringyourownideas/silverstripe-maintenance": "2.7.x-dev" + "silverstripe/framework": "^4.10", + "bringyourownideas/silverstripe-maintenance": "^2" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -57,4 +57,4 @@ "issues": "https://github.com/bringyourownideas/silverstripe-composer-update-checker/issues" }, "homepage": "https://github.com/bringyourownideas/silverstripe-composer-update-checker" -} \ No newline at end of file +}