From f0eb6ce1c26a530a8520304963c0a036a9c57e71 Mon Sep 17 00:00:00 2001 From: Imants Horsts Date: Thu, 16 Jul 2020 00:02:49 +0300 Subject: [PATCH] Fix composer develop install issue (#1368) * Fix composer develop install issue * Update bundler.yml --- .github/workflows/bundler.yml | 1 + composer.json | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bundler.yml b/.github/workflows/bundler.yml index 82f9caca29..e49e557ec4 100644 --- a/.github/workflows/bundler.yml +++ b/.github/workflows/bundler.yml @@ -48,6 +48,7 @@ jobs: run: | # replaces X keys with X-release keys jq '. as $in | reduce (keys_unsorted[] | select(endswith("-release")|not)) as $k ({}; . + {($k) : (($k + "-release") as $kr | $in | if has($kr) then .[$kr] else .[$k] end) } )' < composer.json > tmp && mv tmp composer.json + composer config version --unset - name: Compile JS files for CDN run: | diff --git a/composer.json b/composer.json index f7acab9605..cbf9c66e37 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,6 @@ ], "homepage": "https://github.com/atk4/ui", "license": "MIT", - "minimum-stability": "dev", - "prefer-stable": true, "authors": [ {"name": "Romans Malinovskis", "email": "romans@agiletoolkit.org", "homepage": "https://nearly.guru/" }, {"name": "Alain Belair", "homepage": "https://agiletoolkit.org/"}, @@ -29,6 +27,9 @@ {"name": "Alex Cicovic", "homepage": "https://alexcicovic.com/"}, {"name": "Georgi Hristov", "homepage": "https://xsystems.io/"} ], + "version": "dev-develop", + "minimum-stability": "dev", + "prefer-stable": true, "config": { "sort-packages": true }, @@ -41,8 +42,8 @@ "require-release": { "php": ">=7.3.0", "ext-json": "*", - "atk4/core": "^2.0", - "atk4/data": "^2.0" + "atk4/core": "^2.2.0", + "atk4/data": "^2.2.0" }, "require-dev": { "behat/behat": "^3.4",