infrastructure/blender-buildbot-www
1
0
Fork 2
Code Issues 4 Pull Requests 1 Projects Releases Wiki Activity

Update Production to latest version #17

Merged
Bart van der Braak merged 3 commits from main into production 2024-10-31 13:05:04 +01:00
Conversation 0 Commits 3 Files Changed 3 +31 -19
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,5 +1,9 @@
FROM php:8.1-apache FROM php:8.1-apache
RUN a2enmod proxy && a2enmod rewrite && a2enmod headers RUN a2enmod proxy \
&& a2enmod rewrite \
&& a2enmod headers \
&& a2enmod proxy_wstunnel \
&& a2enmod proxy_http
EXPOSE 80 EXPOSE 80

42
source/templates/content_build_lister.php
View File

@ -85,24 +85,32 @@
?> ?>
</div> </div>
<?php /* Link to archive under the list of builds. */ ?> <?php /* Link to archive under the list of builds, if page is not archive. */ ?>
<div class="builds-archive"> <?php
<?php if ($lister->isExperimental()) { ?> $pagePath = $_SERVER['REQUEST_URI'];
<?php if ($lister->getBranch()) { ?>
<a href="/download/experimental/">All Branches</a> | // Check if page is not archive
if (!(substr($pagePath, -8) == "archive/")):
?>
<div class="builds-archive">
<?php if ($lister->isExperimental()) { ?>
<?php if ($lister->getBranch()) { ?>
<a href="/download/experimental/">All Branches</a> |
<?php } ?>
<a href="/download/experimental/archive/">All Archived Builds</a>
<?php } elseif ($lister->isPatch()) { ?>
<?php if ($lister->getPatch()) { ?>
<a href="/download/patch/">All Patches</a> |
<?php } ?>
<a href="/download/patch/archive/">All Archived Builds</a>
<?php } elseif ($lister->isPythonModule()) { ?>
<a href="/download/bpy/archive/">All Archived Builds</a>
<?php } else { ?>
<a href="/download/daily/archive/">All Archived Builds</a>
<?php } ?> <?php } ?>
<a href="/download/experimental/archive/">All Archived Builds</a> </div>
<?php } elseif ($lister->isPatch()) { ?> <?php
<?php if ($lister->getPatch()) { ?> endif; ?>
<a href="/download/patch/">All Patches</a> |
<?php } ?>
<a href="/download/patch/archive/">All Archived Builds</a>
<?php } elseif ($lister->isPythonModule()) { ?>
<a href="/download/bpy/archive/">All Archived Builds</a>
<?php } else { ?>
<a href="/download/daily/archive/">All Archived Builds</a>
<?php } ?>
</div>
</div> </div>
</div> </div>
</div> </div>

2
source/util.php
View File

@ -42,7 +42,7 @@ function getEnvId() {
$env_id = 'LOCAL'; $env_id = 'LOCAL';
if (preg_match('/\b\.blender.org\b/', $host_id)) { if (preg_match('/\b\.blender.org\b/', $host_id)) {
if (preg_match('/\b\uatest\b/', $host_id)) { if (preg_match('/\b\.uatest\b/', $host_id)) {
$env_id = "UATEST"; $env_id = "UATEST";
} }
else else