Skip to content

Commit f87881e

Browse files
committed
Tag RC7 Dev (hopefully we'll never need an RC7\!)
1 parent e78c397 commit f87881e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>4.0.0-rc6</version>
9+
<version>4.0.0-rc7-dev</version>
1010
<creationDate>August 2021</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

build/build.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ function clean_composer(string $dir)
232232

233233
// Install PHP and NPM dependencies and compile required media assets, skip Composer autoloader until post-cleanup
234234
chdir($fullpath);
235-
system('composer install --no-dev --no-autoloader --ignore-platform-reqs', $composerReturnCode);
235+
system('php /usr/local/bin/composer.phar install --no-dev --no-autoloader --ignore-platform-reqs', $composerReturnCode);
236236

237237
if ($composerReturnCode !== 0)
238238
{
239-
echo "`composer install` did not complete as expected.\n";
239+
echo "`php /usr/local/bin/composer.phar install` did not complete as expected.\n";
240240
exit(1);
241241
}
242242

@@ -270,7 +270,7 @@ function clean_composer(string $dir)
270270
clean_checkout($fullpath);
271271

272272
// Regenerate the Composer autoloader without deleted files
273-
system('composer dump-autoload --no-dev --optimize --no-scripts');
273+
system('php /usr/local/bin/composer.phar dump-autoload --no-dev --optimize --no-scripts');
274274

275275
// Clean the Composer manifests now
276276
clean_composer($fullpath);

libraries/src/Version.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ final class Version
6161
* @var string
6262
* @since 3.8.0
6363
*/
64-
const EXTRA_VERSION = 'rc6';
64+
const EXTRA_VERSION = 'rc7-dev';
6565

6666
/**
6767
* Development status.
6868
*
6969
* @var string
7070
* @since 3.5
7171
*/
72-
const DEV_STATUS = 'Release Candidate';
72+
const DEV_STATUS = 'Development';
7373

7474
/**
7575
* Code name.
@@ -93,7 +93,7 @@ final class Version
9393
* @var string
9494
* @since 3.5
9595
*/
96-
const RELTIME = '22:51';
96+
const RELTIME = '23:02';
9797

9898
/**
9999
* Release timezone.

0 commit comments

Comments
 (0)