diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-10-26 14:43:12 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-10-26 14:54:24 +0200 |
| commit | 0060df3cdad88948084dfd48dabd48ddb1294f29 (patch) | |
| tree | 081e66c30b6e0267b030a0c2052eb496d1ed066f | |
| parent | 8552add4829b97c6584786c8c08d7ce671f9315e (diff) | |
Removed .gitmodules from EASTL.
* Force Gitlab-CI to fail if `make deps`fails.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | EASTL/.gitmodules | 15 | ||||
| -rw-r--r-- | EASTL/test/packages/EABase/.gitmodules | 18 |
3 files changed, 3 insertions, 36 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd90c8..256bef6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ makedeps: - > { test -x x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc && \ test -x x86_64-w64-mingw32/bin/x86_64-w64-mingw32-g++; } || \ - { make deps || cat bld/build.log; } + { make deps || { cat bld/build.log; false; }; } stage: deps only: - master @@ -34,12 +34,12 @@ makedeps-again: - git clean -df . - git clean -dfX . - git checkout . - - make deps || cat bld/build.log + - > + make deps || { cat bld/build.log; false; } stage: deps only: - master when: manual - allow_failure: true build: script: diff --git a/EASTL/.gitmodules b/EASTL/.gitmodules deleted file mode 100644 index 51fa684..0000000 --- a/EASTL/.gitmodules +++ /dev/null @@ -1,15 +0,0 @@ -[submodule "test/packages/EAAssert"] - path = test/packages/EAAssert - url = ../EAAssert.git -[submodule "test/packages/EAMain"] - path = test/packages/EAMain - url = ../EAMain.git -[submodule "test/packages/EAStdC"] - path = test/packages/EAStdC - url = ../EAStdC.git -[submodule "test/packages/EATest"] - path = test/packages/EATest - url = ../EATest.git -[submodule "test/packages/EAThread"] - path = test/packages/EAThread - url = ../EAThread.git diff --git a/EASTL/test/packages/EABase/.gitmodules b/EASTL/test/packages/EABase/.gitmodules deleted file mode 100644 index 165166f..0000000 --- a/EASTL/test/packages/EABase/.gitmodules +++ /dev/null @@ -1,18 +0,0 @@ -[submodule "test/packages/EAMain"] - path = test/packages/EAMain - url = git@github.com:electronicarts/EAMain.git -[submodule "test/packages/EATest"] - path = test/packages/EATest - url = git@github.com:electronicarts/EATest.git -[submodule "test/packages/EAStdC"] - path = test/packages/EAStdC - url = git@github.com:electronicarts/EAStdC.git -[submodule "test/packages/EAAssert"] - path = test/packages/EAAssert - url = git@github.com:electronicarts/EAAssert.git -[submodule "test/packages/EAThread"] - path = test/packages/EAThread - url = git@github.com:electronicarts/EAThread.git -[submodule "test/packages/EASTL"] - path = test/packages/EASTL - url = git@github.com:electronicarts/EASTL.git |