Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
Reverted everything
Browse files Browse the repository at this point in the history
Revert "Disable parallel lint"

This reverts commit 4890a27.

Revert "Add ncurses"

This reverts commit c551711.

Revert "Change CI scripts to use sh"

This reverts commit 2018efa.

Revert "Change entrypoint to be sh compatible"

This reverts commit 0595a92.

Revert "Change Dockerfile to use Alpine"

This reverts commit 3031ea2.

Revert "Upgrade weakref to 0.3.3"

This reverts commit b32aa27.

Revert "Dockerfile: add entrypoint"

This reverts commit ee1f0d0.

Revert "Various fix for production Dockerfile"

This reverts commit 93dae65.

Revert "codefresh: Tag built Docker images"

This reverts commit 0374fc4.

Revert "CI: Fix production Dockerfile syntax"

This reverts commit 5074072.

Revert "codefresh: Fix syntax"

This reverts commit 4a9876f.

Revert "codefresh: Add production container building"

This reverts commit 000b4c4.

Revert "Announce the new downloads"

This reverts commit a700f4c.

Revert "Change documentation upload path"

This reverts commit 8ab0c6f.

Revert "codefresh: better rsync"

This reverts commit 776683b.

Revert "Silence deployment"

This reverts commit 40cd917.

Revert "codefresh: Correctly decode service account (2nd trial)"

This reverts commit 21d2c84.

Revert "Doxygen: more slience"

This reverts commit 25bb8ee.

Revert "codefresh: fix service account decoding"

This reverts commit 789868c.

Revert "Doxygen: be quiet"

This reverts commit 0f55c1c.

Revert "codefresh: Add deployment"

This reverts commit 8fb727f.

Revert "First step of migration to Codefresh"

This reverts commit fac8b09.
  • Loading branch information
dktapps committed Mar 21, 2017
1 parent c551711 commit 8df6921
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ phar:
script:
- sed -i "s/const VERSION \?= \?\"\(.*\)\"/const VERSION = \"\1$([ ${CI_BUILD_REF_NAME} != master ] && echo unsupported-)${CI_BUILD_REF:0:7}\"/" src/pocketmine/PocketMine.php
- sed -i "/GIT_COMMIT/s/0000000000000000000000000000000000000000/${CI_BUILD_REF}/" src/pocketmine/PocketMine.php
- ./ci/run.sh
- ./tests/travis.sh
- mv plugins/DevTools/Genisys*.phar .
artifacts:
paths:
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "src/spl"]
path = src/spl
url = https://github.com/pmmp/PocketMine-SPL.git
[submodule "ci/plugins/PocketMine-DevTools"]
path = ci/plugins/PocketMine-DevTools
[submodule "tests/plugins/PocketMine-DevTools"]
path = tests/plugins/PocketMine-DevTools
url = https://github.com/pmmp/PocketMine-DevTools.git
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ before_script:
- echo | pecl install channel://pecl.php.net/yaml-2.0.0

script:
- ./ci/run.sh
- ./tests/travis.sh

notifications:
email: false
Expand Down
4 changes: 2 additions & 2 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ CITE_BIB_FILES =
# messages are off.
# The default value is: NO.

QUIET = YES
QUIET = NO

# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
Expand All @@ -731,7 +731,7 @@ WARNINGS = YES
# will automatically be disabled.
# The default value is: YES.

WARN_IF_UNDOCUMENTED = NO
WARN_IF_UNDOCUMENTED = YES

# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some parameters
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ However, Genisys still has a long way to go. We welcome contributions.

Help & Support
-------------
[Official Doxygen-generated Documentation](https://storage.googleapis.com/itx-technologies-141911.appspot.com/genisys/docs/index.html)
[Official Doxygen-generated Documentation](https://storage.googleapis.com/itx-technologies-141911.appspot.com/docs/genisys/index.html)

If you have an issue, please make sure to check the [FAQs](https://github.com/iTXTech/Genisys/wiki/FAQs) page before opening any issues. We are constantly fixing issues and are continuously updating, so please also ensure that you are up-to-date before opening any issues.

Expand All @@ -38,7 +38,7 @@ The following chats are bridged:

Get Genisys
-------------
* Download the [latest build](https://storage.googleapis.com/itx-technologies-141911.appspot.com/genisys/Genisys-latest.phar).
* Download from [GitLab CI](https://gitlab.com/itxtech/genisys/pipelines?scope=branches).
* Installation instructions can be found in the [wiki](https://github.com/iTXTech/Genisys/wiki).
* PHP Binaries and other on [here](https://itxtech.org/genisys/get/).

Expand Down
33 changes: 0 additions & 33 deletions ci/prod/Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions ci/prod/docker-entrypoint.sh

This file was deleted.

13 changes: 0 additions & 13 deletions ci/test/Dockerfile

This file was deleted.

60 changes: 0 additions & 60 deletions codefresh.yml

This file was deleted.

2 changes: 1 addition & 1 deletion src/pocketmine/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, $
$nowLang = $this->getProperty("settings.language", "eng");

//Crashes unsupported builds without the correct configuration
if(strpos(\pocketmine\VERSION, "unsupported") !== false and getenv("CI") === false){
if(strpos(\pocketmine\VERSION, "unsupported") !== false and getenv("GITLAB_CI") === false){
if($this->getProperty("settings.enable-testing", false) !== true){
throw new ServerException("This build is not intended for production use. You may set 'settings.enable-testing: true' under pocketmine.yml to allow use of non-production builds. Do so at your own risk and ONLY if you know what you are doing.");
}else{
Expand Down
4 changes: 2 additions & 2 deletions ci/lint.sh → tests/lint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

PHP_BINARY="php"

Expand All @@ -12,7 +12,7 @@ done

echo Running PHP lint scans...

OUTPUT=`find ./src/pocketmine -name "*.php" -print0 | xargs -0 -n1 php -l`
OUTPUT=`find ./src/pocketmine -name "*.php" -print0 | xargs -0 -n1 -P4 php -l`

if [ $? -ne 0 ]; then
echo $OUTPUT | grep -v "No syntax errors"
Expand Down
6 changes: 3 additions & 3 deletions ci/run.sh → tests/travis.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

PHP_BINARY="php"

Expand All @@ -10,14 +10,14 @@ while getopts "p:" OPTION 2> /dev/null; do
esac
done

./ci/lint.sh -p "$PHP_BINARY"
./tests/lint.sh -p "$PHP_BINARY"

if [ $? -ne 0 ]; then
echo Lint scan failed!
exit 1
fi

cp -r ci/plugins plugins
cp -r tests/plugins plugins
"$PHP_BINARY" -dphar.readonly=0 ./plugins/PocketMine-DevTools/src/DevTools/ConsoleScript.php --make ./plugins/PocketMine-DevTools --relative ./plugins/PocketMine-DevTools --out ./plugins/DevTools.phar
rm -rf ./plugins/PocketMine-DevTools

Expand Down

0 comments on commit 8df6921

Please sign in to comment.