From 0693faa587c1c447331dff7e05eccb652c7ef758 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 15 Apr 2020 16:15:39 -0300 Subject: [PATCH] Update GTest example Signed-off-by: Uilian Ries --- integrations/ci/appveyor.rst | 17 +++++------------ integrations/ci/circleci.rst | 5 +++-- integrations/ci/gitlab.rst | 3 ++- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/integrations/ci/appveyor.rst b/integrations/ci/appveyor.rst index 8c16766f1da0..f09bc0f2b65a 100644 --- a/integrations/ci/appveyor.rst +++ b/integrations/ci/appveyor.rst @@ -27,7 +27,7 @@ Clone the project from github: .. code-block:: bash - $ git clone https://github.com/lasote/conan-gtest-example + $ git clone https://github.com/conan-io/examples Create an ``appveyor.yml`` file and paste this code in it: @@ -46,20 +46,13 @@ Create an ``appveyor.yml`` file and paste this code in it: - cmd: conan user # Create the conan data directory - cmd: conan --version - build_script: - - cmd: mkdir build - - cmd: conan install . -o gtest:shared=True - - cmd: cd build - - cmd: cmake ../ -DBUILD_TEST=TRUE -G "Visual Studio 14 2015 Win64" - - cmd: cmake --build . --config Release - test_script: - - cmd: cd bin - - cmd: encryption_test.exe + - cmd: cd libraries/gtest/encryption + - cmd: conan create . -Appveyor will install the **Conan** tool and will execute the **conan install** command. -Then, the **build_script** section creates the build folder, compiles the project with **cmake** and the section **test_script** runs the **tests**. +Appveyor will install the **Conan** tool and will execute the **conan create** command. +Then, the **test_script** section compiles the project with **cmake** and the **tests**. Creating, testing and uploading Conan binary packages ------------------------------------------------------- diff --git a/integrations/ci/circleci.rst b/integrations/ci/circleci.rst index ecb2aed15624..47715efe4a70 100644 --- a/integrations/ci/circleci.rst +++ b/integrations/ci/circleci.rst @@ -27,7 +27,7 @@ Clone the project from github: .. code-block:: bash - $ git clone https://github.com/lasote/conan-gtest-example + $ git clone https://github.com/conan-io/examples Create a ``.circleci/config.yml`` file and paste this code in it: @@ -38,7 +38,7 @@ Create a ``.circleci/config.yml`` file and paste this code in it: version: 2 gcc-6: docker: - - image: conanio/gcc6 + - image: conanio/gcc9 steps: - checkout - run: @@ -46,6 +46,7 @@ Create a ``.circleci/config.yml`` file and paste this code in it: command: | sudo pip install --upgrade conan conan user + cd libraries/gtest/encryption conan create . user/channel workflows: version: 2 diff --git a/integrations/ci/gitlab.rst b/integrations/ci/gitlab.rst index f3ea71c0568d..7eaecad4e66f 100644 --- a/integrations/ci/gitlab.rst +++ b/integrations/ci/gitlab.rst @@ -27,7 +27,7 @@ Clone the project from github: .. code-block:: bash - $ git clone https://github.com/lasote/conan-gtest-example + $ git clone https://github.com/conan-io/examples Create a ``.gitlab-ci.yml`` file and paste this code in it: @@ -46,6 +46,7 @@ Create a ``.gitlab-ci.yml`` file and paste this code in it: script: # Download dependencies, build, test and create package + - cd libraries/gtest/encryption - conan create . user/channel