Merge branch '1.4.x' into fix-vcs-documents-not-deleted
This commit is contained in:
commit
8798d183bd
3 changed files with 24 additions and 34 deletions
|
@ -86,7 +86,7 @@
|
|||
],
|
||||
"require-dev": {
|
||||
"ext-fileinfo": "*",
|
||||
"appwrite/sdk-generator": "dev-feat-whitelist-enums as 0.35.2",
|
||||
"appwrite/sdk-generator": "0.35.*",
|
||||
"phpunit/phpunit": "9.5.20",
|
||||
"squizlabs/php_codesniffer": "^3.7",
|
||||
"swoole/ide-helper": "5.0.2",
|
||||
|
|
29
composer.lock
generated
29
composer.lock
generated
|
@ -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": "31937ddcd75e14c0af8d387941678509",
|
||||
"content-hash": "9afc62ce9c6ba587b9c028e11494e026",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adhocore/jwt",
|
||||
|
@ -3136,16 +3136,16 @@
|
|||
"packages-dev": [
|
||||
{
|
||||
"name": "appwrite/sdk-generator",
|
||||
"version": "dev-feat-whitelist-enums",
|
||||
"version": "0.35.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/appwrite/sdk-generator.git",
|
||||
"reference": "c921cbbcfb5ef16305c6455fe5ca27fdab75c00a"
|
||||
"reference": "2dfe0430a64ffd2a07078d83b20144b871acac3b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/c921cbbcfb5ef16305c6455fe5ca27fdab75c00a",
|
||||
"reference": "c921cbbcfb5ef16305c6455fe5ca27fdab75c00a",
|
||||
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/2dfe0430a64ffd2a07078d83b20144b871acac3b",
|
||||
"reference": "2dfe0430a64ffd2a07078d83b20144b871acac3b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -3181,9 +3181,9 @@
|
|||
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
|
||||
"support": {
|
||||
"issues": "https://github.com/appwrite/sdk-generator/issues",
|
||||
"source": "https://github.com/appwrite/sdk-generator/tree/feat-whitelist-enums"
|
||||
"source": "https://github.com/appwrite/sdk-generator/tree/0.35.2"
|
||||
},
|
||||
"time": "2023-11-01T04:40:27+00:00"
|
||||
"time": "2023-09-14T14:59:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/deprecations",
|
||||
|
@ -5796,18 +5796,9 @@
|
|||
"time": "2023-08-28T11:09:02+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [
|
||||
{
|
||||
"package": "appwrite/sdk-generator",
|
||||
"version": "dev-feat-whitelist-enums",
|
||||
"alias": "0.35.2",
|
||||
"alias_normalized": "0.35.2.0"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": {
|
||||
"appwrite/sdk-generator": 20
|
||||
},
|
||||
"stability-flags": [],
|
||||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
|
@ -5831,5 +5822,5 @@
|
|||
"platform-overrides": {
|
||||
"php": "8.0"
|
||||
},
|
||||
"plugin-api-version": "2.6.0"
|
||||
"plugin-api-version": "2.3.0"
|
||||
}
|
||||
|
|
|
@ -252,20 +252,19 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|||
}
|
||||
|
||||
if ($git && !empty($gitUrl)) {
|
||||
\exec("
|
||||
rm -rf $target
|
||||
mkdir -p $target
|
||||
cd $target
|
||||
git init --initial-branch=$gitBranch
|
||||
git remote add origin $gitUrl
|
||||
git fetch origin $gitBranch
|
||||
git pull origin $gitBranch
|
||||
rm -rf $target/*
|
||||
cp -r $result/* $target/
|
||||
git add .
|
||||
git commit -m \"$message\"
|
||||
git push -u origin $gitBranch
|
||||
");
|
||||
\exec('rm -rf ' . $target . ' && \
|
||||
mkdir -p ' . $target . ' && \
|
||||
cd ' . $target . ' && \
|
||||
git init --initial-branch=' . $gitBranch . ' && \
|
||||
git remote add origin ' . $gitUrl . ' && \
|
||||
git fetch origin ' . $gitBranch . ' && \
|
||||
git pull origin ' . $gitBranch . ' && \
|
||||
rm -rf ' . $target . '/* && \
|
||||
cp -r ' . $result . '/* ' . $target . '/ && \
|
||||
git add . && \
|
||||
git commit -m "' . $message . '" && \
|
||||
git push -u origin ' . $gitBranch . '
|
||||
');
|
||||
|
||||
Console::success("Pushed {$language['name']} SDK to {$gitUrl}");
|
||||
|
||||
|
|
Loading…
Reference in a new issue