mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge branch '1.8.x' into fix/cli-static-setresource
This commit is contained in:
1 file changed
+12
@@ -109,6 +109,12 @@ class Base extends Action
|
||||
} catch (\Throwable $error) {
|
||||
// Ignore; deployment can continue
|
||||
}
|
||||
} else {
|
||||
// Fallback till we have tag support here
|
||||
// Goal is to set providerBranch, so build worker knows what to clone as base
|
||||
// Without this, clone command would be cloning empty branch, and failing
|
||||
$providerBranch = $function->getAttribute('providerBranch', 'main');
|
||||
$branchUrl = "https://github.com/$owner/$repositoryName/tree/$providerBranch";
|
||||
}
|
||||
|
||||
$repositoryUrl = "https://github.com/$owner/$repositoryName";
|
||||
@@ -199,6 +205,12 @@ class Base extends Action
|
||||
} catch (\Throwable $error) {
|
||||
// Ignore; deployment can continue
|
||||
}
|
||||
} else {
|
||||
// Fallback till we have tag support here
|
||||
// Goal is to set providerBranch, so build worker knows what to clone as base
|
||||
// Without this, clone command would be cloning empty branch, and failing
|
||||
$providerBranch = $site->getAttribute('providerBranch', 'main');
|
||||
$branchUrl = "https://github.com/$owner/$repositoryName/tree/$providerBranch";
|
||||
}
|
||||
|
||||
$repositoryUrl = "https://github.com/$owner/$repositoryName";
|
||||
|
||||
Reference in new issue
Block a user