From 35d6b2a90e8fb3075e8a68229bf8b47c1db68063 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Thu, 28 Sep 2023 14:40:55 +1300 Subject: [PATCH] feat: bump to silvershop 4 --- .github/workflows/ci.yml | 11 +++++++++++ .gitignore | 3 ++- composer.json | 10 ++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..bf02210 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,11 @@ +name: CI + +on: + push: + pull_request: + workflow_dispatch: + +jobs: + ci: + name: CI + uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.gitignore b/.gitignore index 17b4895..443be9b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ /tools/phing-metadata # ignore composer vendor folder -/vendor/ \ No newline at end of file +/vendor/ +composer.lock diff --git a/composer.json b/composer.json index c7ab1bb..502dbe3 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ "silvershop/stock": "3.x-dev", "silvershop/discounts": "3.x-dev", "silvershop/shipping": "3.x-dev", - "silvershop/geocoding": "3.x-dev", "silvershop/comparison": "3.x-dev", "silvershop/coloredvariations": "3.x-dev" }, @@ -25,8 +24,15 @@ } }, "config": { - "process-timeout": 600 + "process-timeout": 600, + "preferred-install": "source" }, + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:silvershop/silvershop-core.git" + } + ], "prefer-stable": true, "minimum-stability": "dev" }