diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e6a6f44510cff8de01d188434e4016fac00c1c1..054d020a0333583eea422def0844364fee5cf640 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,8 +120,8 @@ conan:linux:gcc5.3.1: - opengl script: - mkdir build - #- conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan - #- conan user -p %CONAN_PASSWORD% -r rwth-vr--bintray %CONAN_LOGIN_USERNAME% + - conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan + - conan user -p $CONAN_PASSWORD -r rwth-vr--bintray $CONAN_LOGIN_USERNAME - cd build - export CC=gcc - export CXX=g++ @@ -138,8 +138,8 @@ conan:linux:gcc6.3.1: - opengl script: - mkdir build - #- conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan - #- conan user -p %CONAN_PASSWORD% -r rwth-vr--bintray %CONAN_LOGIN_USERNAME% + - conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan + - conan user -p $CONAN_PASSWORD -r rwth-vr--bintray $CONAN_LOGIN_USERNAME - cd build - export CC=gcc - export CXX=g++ diff --git a/tests/src/mocks/generation/Create_openGL_mock.py b/tests/src/mocks/generation/Create_openGL_mock.py index e113d9005ca04a02224e258bb5c6c71d5497de26..b7e772d35629c766c0dfe831e809bcb6d2cc200a 100644 --- a/tests/src/mocks/generation/Create_openGL_mock.py +++ b/tests/src/mocks/generation/Create_openGL_mock.py @@ -329,7 +329,7 @@ def Read_GLEW_methods(): def Filter_GLEW_methods(): - print "we delete methods that have mote than 15 parameters since trompeloeil has no mock macro for it" + print "we delete methods that have more than 15 parameters since trompeloeil has no mock macro for it" i = 0 n = len(functions) while i < n: