summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2020-10-08 22:26:02 -0100
committerMaxence Lange <maxence@artificial-owl.com>2020-10-08 22:26:02 -0100
commitf696d0d58f0c7eb3071b84db39d5677d4a3bef99 (patch)
treeee619002f24d24b9b1900de30d386dbec91fc5a1
parentb1be4d0437e048bdc8dbdffb696ddf98c242e969 (diff)
fix composer for nc20
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r--Makefile8
-rw-r--r--composer.lock10
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index c83a940f..5c608f57 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,8 @@ clean-dev:
rm -rf node_modules
build-composer:
- composer install --prefer-dist --working-dir composer
- composer update --prefer-dist --working-dir composer
+ composer install --prefer-dist
+ composer update --prefer-dist
# releasing to github
release: appstore github-release github-upload
@@ -101,8 +101,8 @@ appstore: dev-setup lint build-js-production build-composer
--exclude=/.babelrc.js \
--exclude=/.drone.yml \
--exclude=/.eslintrc.js \
- --exclude=/composer/composer.json \
- --exclude=/composer/composer.lock \
+ --exclude=/composer.json \
+ --exclude=/composer.lock \
--exclude=/src \
--exclude=/node_modules \
--exclude=/webpack.*.js \
diff --git a/composer.lock b/composer.lock
index de4b7541..c951dbec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "773474981fdf7ef0b2f1bcf58cf1b2ec",
+ "content-hash": "a5fe26ce64e01c6e8e2687e75ff674fb",
"packages": [
{
"name": "daita/my-small-php-tools",
@@ -12,12 +12,12 @@
"source": {
"type": "git",
"url": "https://github.com/daita/my-small-php-tools.git",
- "reference": "4e602526c3afbba7255ae4764037562075ef030f"
+ "reference": "ca9c257dd640576c072cb50282e15ae51147cfc2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/4e602526c3afbba7255ae4764037562075ef030f",
- "reference": "4e602526c3afbba7255ae4764037562075ef030f",
+ "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/ca9c257dd640576c072cb50282e15ae51147cfc2",
+ "reference": "ca9c257dd640576c072cb50282e15ae51147cfc2",
"shasum": ""
},
"require": {
@@ -40,7 +40,7 @@
}
],
"description": "My small PHP Tools",
- "time": "2020-08-06T13:26:28+00:00"
+ "time": "2020-09-29T15:30:16+00:00"
},
{
"name": "friendica/json-ld",