Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #9919 from appwrite/feat-update-branch-url

Browse source 
Shorten commit url and branch url
This commit is contained in:
Matej Bačo 2025-05-28 10:57:51 +02:00 committed by GitHub
commit af6499bd47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/api/vcs.php
View file

@ -293,7 +293,13 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
// VCS branch preview
if (!empty($providerBranch)) {
$domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
$branchPrefix = substr($providerBranch, 0, 16);
if (strlen($providerBranch) > 16) {
$remainingChars = substr($providerBranch, 16);
$branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
}
$resourceProjectHash = substr(hash('sha256', $resource->getId() . $project->getId()), 0, 7);
$domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
$ruleId = md5($domain);
try {
Authorization::skip(
@ -324,7 +330,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
// VCS commit preview
if (!empty($providerCommitHash)) {
$domain = "commit-{$providerCommitHash}.{$sitesDomain}";
$domain = "commit-" . substr($providerCommitHash, 0, 16) . ".{$sitesDomain}";
$ruleId = md5($domain);
try {
Authorization::skip(

24
composer.lock generated
View file

@ -157,16 +157,16 @@
},
{
"name": "appwrite/php-runtimes",
"version": "0.19.0",
"version": "0.19.1",
"source": {
"type": "git",
"url": "https://github.com/appwrite/runtimes.git",
"reference": "8d21483efc19b9d977e323188989ee67a188464b"
"reference": "7bd0cc3cb97de625d7b07230bd91b121f88e72ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/runtimes/zipball/8d21483efc19b9d977e323188989ee67a188464b",
"reference": "8d21483efc19b9d977e323188989ee67a188464b",
"url": "https://api.github.com/repos/appwrite/runtimes/zipball/7bd0cc3cb97de625d7b07230bd91b121f88e72ae",
"reference": "7bd0cc3cb97de625d7b07230bd91b121f88e72ae",
"shasum": ""
},
"require": {
@ -206,9 +206,9 @@
],
"support": {
"issues": "https://github.com/appwrite/runtimes/issues",
"source": "https://github.com/appwrite/runtimes/tree/0.19.0"
"source": "https://github.com/appwrite/runtimes/tree/0.19.1"
},
"time": "2025-03-25T22:37:51+00:00"
"time": "2025-05-27T07:12:56+00:00"
},
{
"name": "beberlei/assert",
@ -4378,16 +4378,16 @@
},
{
"name": "utopia-php/storage",
"version": "0.18.12",
"version": "0.18.13",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/storage.git",
"reference": "9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97"
"reference": "3d8ce53ae042173bf230445e996056c5f65ded22"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/storage/zipball/9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97",
"reference": "9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97",
"url": "https://api.github.com/repos/utopia-php/storage/zipball/3d8ce53ae042173bf230445e996056c5f65ded22",
"reference": "3d8ce53ae042173bf230445e996056c5f65ded22",
"shasum": ""
},
"require": {
@ -4430,9 +4430,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/storage/issues",
"source": "https://github.com/utopia-php/storage/tree/0.18.12"
"source": "https://github.com/utopia-php/storage/tree/0.18.13"
},
"time": "2025-05-15T07:55:58+00:00"
"time": "2025-05-26T13:10:35+00:00"
},
{
"name": "utopia-php/swoole",

8
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
View file

@ -1132,7 +1132,13 @@ class Builds extends Action
$branchName = $deployment->getAttribute('providerBranch');
if (!empty($branchName)) {
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$domain = "branch-{$branchName}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
$branchPrefix = substr($branchName, 0, 16);
if (strlen($branchName) > 16) {
$remainingChars = substr($branchName, 16);
$branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
}
$resourceProjectHash = substr(hash('sha256', $resource->getId() . $project->getId()), 0, 7);
$domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
$ruleId = md5($domain);
try {