Merge branch '2.3' into 2

Merge pull request #152 from creative-commoners/pulls/2.3/composer
DEP Bump minimum version of framework
2024-10-22 17:05:45 +02:00 · 2024-07-11 16:21:38 +12:00 · 2024-07-11 10:00:11 +12:00 · 2024-07-10 12:31:34 +12:00 · 2023-03-23 14:15:32 +13:00 · 2023-03-21 14:32:24 +13:00
4 changed files with 23 additions and 11 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -4,15 +4,10 @@ on:
  push:
  pull_request:
  workflow_dispatch:
-  # Every Thursday at 12:20pm UTC
-  schedule:
-    - cron: '20 12 * * 4'

 jobs:
  ci:
    name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
    with:
      # set phpunit to false to prevent automatic generation of mysql phpunit jobs
--- a/.github/workflows/dispatch-ci.yml
+++ b/.github/workflows/dispatch-ci.yml
@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:20 PM UTC, only on Thursday and Friday
+  schedule:
+    - cron: '20 12 * * 4,5'
+
+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
--- a/README.md
+++ b/README.md
@ -3,10 +3,6 @@
 [![CI](https://github.com/silverstripe/silverstripe-postgresql/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-postgresql/actions/workflows/ci.yml)
 [![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

-## Maintainer Contact
-
- * Sam Minnee (Nickname: sminnee) <sam@silverstripe.com>
-
 ## Requirements

 * Silverstripe 4.0
@ -47,6 +43,12 @@ See [docs/en](docs/en/README.md) for more information about configuring the modu
 All column and table names must be double-quoted.  PostgreSQL automatically 
 lower-cases columns, and your queries will fail if you don't.

+Collations have known issues when installed on Alpine, MacOS X and BSD derivatives
+(see [PostgreSQL FAQ](https://wiki.postgresql.org/wiki/FAQ#Why_do_my_strings_sort_incorrectly.3F)).
+We do not support such installations, although they still may work correctly for you.
+As a workaround for PostgreSQL 10+ you could manually switch to ICU collations (e.g. und-x-icu).
+There are no known workarounds for PostgreSQL <10.
+
 Ts_vector columns are not automatically detected by the built-in search 
 filters.  That means if you're doing a search through the CMS on a ModelAdmin
 object, it will use LIKE queries which are very slow.  If you're writing your 
--- a/composer.json
+++ b/composer.json
@ -15,14 +15,13 @@
        }
    ],
    "require": {
-        "silverstripe/framework": "^4",
+        "silverstripe/framework": "^4.10",
        "silverstripe/vendor-plugin": "^1.0"
    },
    "require-dev": {
        "phpunit/phpunit": "^9.5",
        "squizlabs/php_codesniffer": "^3"
    },
-    "extra": { },
    "autoload": {
        "psr-4": {
            "SilverStripe\\PostgreSQL\\": "code/",
Author	SHA1	Message	Date
Steve Boyd	091a4c2416	Merge branch '2.3' into 2	2024-07-11 16:21:38 +12:00
Guy Sartorelli	b37c19d6d5	Merge pull request #152 from creative-commoners/pulls/2.3/composer DEP Bump minimum version of framework	2024-07-11 10:00:11 +12:00
Steve Boyd	24dbdeb564	DEP Bump minimum version of framework	2024-07-10 12:31:34 +12:00
Maxime Rainville	a60fc4cf24	Merge pull request #146 from creative-commoners/pulls/2/dispatch-ci MNT Use gha-dispatch-ci	2023-03-23 14:15:32 +13:00
Steve Boyd	d2fbce5319	MNT Use gha-dispatch-ci	2023-03-21 14:32:24 +13:00
Steve Boyd	beb0f84f2d	Merge branch '2.3' into 2	2022-08-03 14:33:11 +12:00
Steve Boyd	448828c20a	Merge branch '2.3' into 2	2022-07-26 16:45:04 +12:00
Guy Sartorelli	c9bce8fe57	Merge branch '2.3' into 2	2022-06-14 11:31:28 +12:00
Steve Boyd	321d0d853b	Merge branch '2.3' into 2	2022-04-22 09:32:30 +12:00
Steve Boyd	222f20529c	Update build status badge	2021-01-21 16:37:01 +13:00
Steve Boyd	c46272e751	Merge branch '2.3' into 2	2021-01-18 13:59:53 +13:00
Steve Boyd	a709a741b0	Merge branch '2.3' into 2	2021-01-02 20:09:58 +13:00
Robbie Averill	a7c3450d43	Merge branch 'pulls/docs-known-issue' into 2 # Conflicts: # README.md #	2019-11-27 17:33:06 -08:00
Robbie Averill	0be39423a3	Merge branch '2.3' into 2	2019-11-27 17:28:00 -08:00
Maxime Rainville	3e38f845e3	Bump branch alias to 2.4.	2019-10-02 14:48:55 +13:00
Ingo Schommer	66376db094	DOCS Known issue about collations Moving from https://docs.silverstripe.org/en/4/getting_started/server_requirements/ since it's too much noise there. Also removing the maintainer contact, that's an outdated concept.	2019-09-03 15:22:14 +12:00