From 6c6c32e81597b5298a5a6694538212de462a3c44 Mon Sep 17 00:00:00 2001
From: Kevin Backhouse <kevinbackhouse@github.com>
Date: Thu, 9 Sep 2021 13:34:27 +0100
Subject: [PATCH] Standardize on conan 1.39.0

---
 .github/workflows/on_PR_linux_matrix.yml        | 2 +-
 .github/workflows/on_PR_linux_special_buils.yml | 8 ++++----
 .github/workflows/on_PR_windows_matrix.yml      | 2 +-
 .github/workflows/on_push_BasicWinLinMac.yml    | 4 ++--
 .github/workflows/on_push_ExtraJobsForMain.yml  | 2 +-
 .github/workflows/release.yml                   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml
index f7f829d936..95ebcacefb 100644
--- a/.github/workflows/on_PR_linux_matrix.yml
+++ b/.github/workflows/on_PR_linux_matrix.yml
@@ -19,7 +19,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
diff --git a/.github/workflows/on_PR_linux_special_buils.yml b/.github/workflows/on_PR_linux_special_buils.yml
index 92c57d879a..d41ca19e9d 100644
--- a/.github/workflows/on_PR_linux_special_buils.yml
+++ b/.github/workflows/on_PR_linux_special_buils.yml
@@ -16,7 +16,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
@@ -64,7 +64,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind ninja-build
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
@@ -102,7 +102,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
@@ -140,7 +140,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind doxygen graphviz gettext
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
index 2b9253ead3..d1a673d404 100644
--- a/.github/workflows/on_PR_windows_matrix.yml
+++ b/.github/workflows/on_PR_windows_matrix.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install conan
+          pip.exe install "conan==1.39.0"
           conan profile new --detect default
           conan profile update settings.build_type=${{matrix.build_type}} default
           conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
index 15ac879221..5eaa768f89 100644
--- a/.github/workflows/on_push_BasicWinLinMac.yml
+++ b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install conan
+          pip.exe install "conan==1.39.0"
           conan profile new --detect default
           conan profile show default
 
@@ -64,7 +64,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan
         run: |
diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml
index b769448506..2572dac982 100644
--- a/.github/workflows/on_push_ExtraJobsForMain.yml
+++ b/.github/workflows/on_push_ExtraJobsForMain.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: install dependencies
         run: |
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index df19bc7b4f..cdb8e0b5f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
           sudo apt-get install gettext
           sudo apt-get install doxygen
           sudo apt-get install graphviz
-          pip3 install conan==1.36.0
+          pip3 install conan==1.39.0
 
       - name: Conan common config
         run: |
@@ -114,7 +114,7 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install conan
+          pip.exe install "conan==1.39.0"
           conan profile new --detect default
           conan profile update settings.build_type=Release default
           conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache