From db6705814a0a881eae7837607c532e5c2a8b9ee1 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Tue, 16 Feb 2021 18:21:54 +0000 Subject: [PATCH 1/5] Update monorepo-split.yml --- .github/workflows/monorepo-split.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml index 7b5f3ca..8d23281 100644 --- a/.github/workflows/monorepo-split.yml +++ b/.github/workflows/monorepo-split.yml @@ -38,6 +38,7 @@ jobs: package-directory: 'packages/${{ matrix.package }}' split-repository-organization: 'squirephp' split-repository-name: '${{ matrix.package }}' + branch: main tag: ${{ steps.previous-tag.outputs.tag }} user-name: "Dan Harrin" - user-email: "dan@danharrin.com" \ No newline at end of file + user-email: "dan@danharrin.com" From 100065bc6890715cf94bdc1c5848a72781f07349 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 11 Mar 2021 19:44:02 +0000 Subject: [PATCH 2/5] Fix monorepo builder action branch --- .github/workflows/monorepo-split.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml index 8d23281..001a020 100644 --- a/.github/workflows/monorepo-split.yml +++ b/.github/workflows/monorepo-split.yml @@ -31,7 +31,7 @@ jobs: - id: previous-tag uses: "WyriHaximus/github-action-get-previous-tag@master" - name: Monorepo Split of ${{ matrix.package }} - uses: symplify/github-action-monorepo-split@master + uses: symplify/github-action-monorepo-split@main env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} with: From 24131f47f5b9f5b6262c651b5d0a66abb2b6d2bf Mon Sep 17 00:00:00 2001 From: Nico Orfanos Date: Wed, 17 Mar 2021 08:54:58 +0100 Subject: [PATCH 3/5] Update data.csv --- packages/countries-en/resources/data.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/countries-en/resources/data.csv b/packages/countries-en/resources/data.csv index fbbdf7c..71ffbc8 100644 --- a/packages/countries-en/resources/data.csv +++ b/packages/countries-en/resources/data.csv @@ -94,6 +94,7 @@ gu,1671,Hagatna,gu,gum,oc,usd,πŸ‡¬πŸ‡Ί,Guam gw,245,Bissau,gw,gnb,af,xof,πŸ‡¬πŸ‡Ό,Guinea-Bissau gy,592,Georgetown,gy,guy,sa,gyd,πŸ‡¬πŸ‡Ύ,Guyana hk,852,Hong Kong,hk,hkg,as,hkd,πŸ‡­πŸ‡°,Hong Kong +hm,672,,,,,,πŸ‡¦πŸ‡Ί,Heard & McDonald Islands hn,504,Tegucigalpa,hn,hnd,na,hnl,πŸ‡­πŸ‡³,Honduras hr,385,Zagreb,hr,hrv,eu,hrk,πŸ‡­πŸ‡·,Croatia ht,509,Port-au-Prince,ht,hti,na,htg,πŸ‡­πŸ‡Ή,Haiti @@ -247,4 +248,4 @@ ye,967,Sanaa,ye,yem,as,yer,πŸ‡ΎπŸ‡ͺ,Yemen yt,262,Mamoudzou,yt,myt,af,eur,πŸ‡ΎπŸ‡Ή,Mayotte za,27,Pretoria,za,zaf,af,zar,πŸ‡ΏπŸ‡¦,South Africa zm,260,Lusaka,zm,zmb,af,zmk,πŸ‡ΏπŸ‡²,Zambia -zw,263,Harare,zw,zwe,af,zwl,πŸ‡ΏπŸ‡Ό,Zimbabwe \ No newline at end of file +zw,263,Harare,zw,zwe,af,zwl,πŸ‡ΏπŸ‡Ό,Zimbabwe From 54aa84cf02163dd68e563f791e583deb1e10c45c Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Wed, 17 Mar 2021 08:56:02 +0000 Subject: [PATCH 4/5] Update data.csv --- packages/countries-en/resources/data.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/countries-en/resources/data.csv b/packages/countries-en/resources/data.csv index 71ffbc8..596650c 100644 --- a/packages/countries-en/resources/data.csv +++ b/packages/countries-en/resources/data.csv @@ -94,7 +94,7 @@ gu,1671,Hagatna,gu,gum,oc,usd,πŸ‡¬πŸ‡Ί,Guam gw,245,Bissau,gw,gnb,af,xof,πŸ‡¬πŸ‡Ό,Guinea-Bissau gy,592,Georgetown,gy,guy,sa,gyd,πŸ‡¬πŸ‡Ύ,Guyana hk,852,Hong Kong,hk,hkg,as,hkd,πŸ‡­πŸ‡°,Hong Kong -hm,672,,,,,,πŸ‡¦πŸ‡Ί,Heard & McDonald Islands +hm,672,,hm,hmd,oc,,πŸ‡¦πŸ‡Ί,Heard Island and McDonald Islands hn,504,Tegucigalpa,hn,hnd,na,hnl,πŸ‡­πŸ‡³,Honduras hr,385,Zagreb,hr,hrv,eu,hrk,πŸ‡­πŸ‡·,Croatia ht,509,Port-au-Prince,ht,hti,na,htg,πŸ‡­πŸ‡Ή,Haiti From 627801b49d98a8ee13cb7d73211218fb0a25e7a0 Mon Sep 17 00:00:00 2001 From: Ibrahim AshShohail Date: Tue, 23 Mar 2021 17:15:00 +0300 Subject: [PATCH 5/5] Update Model.php to prevent `$sqliteConnection` overrides when multiple models are booted --- packages/model/src/Model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/model/src/Model.php b/packages/model/src/Model.php index e8913e9..59410b3 100644 --- a/packages/model/src/Model.php +++ b/packages/model/src/Model.php @@ -12,7 +12,7 @@ class Model extends Eloquent\Model public static $schema = []; - protected static $sqliteConnection; + protected static $sqliteConnections = []; protected static function boot() { @@ -143,12 +143,12 @@ public static function migrate($locale = null) public static function resolveConnection($connection = null) { - return static::$sqliteConnection; + return static::$sqliteConnections[static::class]; } protected static function setSqliteConnection($database) { - static::$sqliteConnection = app(ConnectionFactory::class)->make([ + static::$sqliteConnections[static::class] = app(ConnectionFactory::class)->make([ 'driver' => 'sqlite', 'database' => $database, ]); @@ -158,4 +158,4 @@ public function usesTimestamps() { return false; } -} \ No newline at end of file +}