Merge pull request #32 from KareemAliAWS/master

Pin the Catch2 dependency and update CI YAML
aws-samples · Oct 16, 2020 · 6d1377a · 6d1377a
2 parents 102e46e + 1b254d3
commit 6d1377a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Install Catch2
       working-directory: ${{ github.workspace }}
       run: |
-        git clone https://github.com/catchorg/Catch2.git
+        git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git
         cd Catch2
         mkdir build
         cd build
@@ -85,7 +85,7 @@ jobs:
     - name: install Catch2
       working-directory: ${{ github.workspace }}
       run: |
-        git clone https://github.com/catchorg/Catch2.git
+        git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git
         cd Catch2
         mkdir build
         cd build
@@ -97,7 +97,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DOPENSSL_ROOT_DIR=/usr/local/Cellar/[email protected]/1.1.1g/ -DOPENSSL_LIBRARIES=/usr/local/Cellar/[email protected]/1.1.1g/lib/
+        cmake ..
         make
   windows:
     runs-on: windows-latest
@@ -121,7 +121,7 @@ jobs:
           $env:Path += ";C:\Program Files\OpenSSL\bin"
       - name: Install Catch2
         run: |
-          git clone https://github.com/catchorg/Catch2.git
+          git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git
           cd Catch2
           mkdir build
           cd build

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ install:
   - make
   - sudo make install
   - cd $TRAVIS_BUILD_DIR
-  - git clone https://github.com/catchorg/Catch2.git
+  - git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git
   - cd Catch2
   - mkdir -p build
   - cd build

diff --git a/Dockerfile b/Dockerfile
@@ -45,7 +45,7 @@ RUN git clone https://github.com/openssl/openssl.git && \
 	make all && \
 	cd /home/dependencies
 
-RUN git clone https://github.com/catchorg/Catch2.git && \
+RUN git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git && \
 	cd Catch2 && \
 	mkdir build && \
 	cd build && \

diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ Run the ./Configure command without any arguments to check the available platfor
 
 #### 5. Download and install Catch2 test framework
 
-    git clone https://github.com/catchorg/Catch2.git
+    git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git
     cd Catch2
     mkdir build
     cd build

diff --git a/windows-localproxy-build.md b/windows-localproxy-build.md
@@ -26,7 +26,7 @@
 		* Update PATH environment variable to add the dll for openssl which is inside C:\Program Files\OpenSSL\bin
 		* Download and install catch2
 		* Use Visual Studio native tool command prompt in admin mode.
-		* `git clone https://github.com/catchorg/Catch2.git`
+		* `git clone --branch v2.13.2 https://github.com/catchorg/Catch2.git`
 		* `cd Catch2`
 		* `mkdir build`
 		* `cd build`