build: Conan settings update step moved up

mpusz · Sep 26, 2023 · d9dc374 · d9dc374
1 parent 31f45ce
commit d9dc374
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -209,6 +209,12 @@ jobs:
         shell: bash
         run: |
           pip install -U conan
+      - name: Add support for clang-17 to Conan's settings.yml
+        # TODO Remove when Conan will support clang-17
+        if: matrix.config.compiler.type == 'CLANG'
+        shell: bash
+        run: |
+          sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml
       - name: Configure Conan
         shell: bash
         run: |
@@ -219,12 +225,6 @@ jobs:
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^compiler.cppstd=.*/compiler.cppstd=${{ matrix.config.compiler.std }}/' ~/.conan2/profiles/default
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^build_type=.*/build_type=${{ matrix.build_type }}/' ~/.conan2/profiles/default
           conan profile show -pr default
-      - name: Add support for clang-17 to Conan's settings.yml
-        # TODO Remove when Conan will support clang-17
-        if: matrix.config.compiler.type == 'CLANG'
-        shell: bash
-        run: |
-          sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml
       - name: Create Conan package
         shell: bash
         run: |

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
@@ -186,6 +186,12 @@ jobs:
         shell: bash
         run: |
           pip install -U conan
+      - name: Add support for clang-17 to Conan's settings.yml
+        # TODO Remove when Conan will support clang-17
+        if: matrix.config.compiler.type == 'CLANG'
+        shell: bash
+        run: |
+          sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml
       - name: Configure Conan
         shell: bash
         run: |
@@ -197,12 +203,6 @@ jobs:
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^compiler.cppstd=.*/compiler.cppstd=${{ matrix.config.compiler.std }}/' ~/.conan2/profiles/default
           sed -i.backup '/^\[settings\]$/,/^\[/ s/^build_type=.*/build_type=${{ matrix.build_type }}/' ~/.conan2/profiles/default
           conan profile show -pr default
-      - name: Add support for clang-17 to Conan's settings.yml
-        # TODO Remove when Conan will support clang-17
-        if: matrix.config.compiler.type == 'CLANG'
-        shell: bash
-        run: |
-          sed -i -e 's/"8", "9", "10", "11", "12", "13", "14", "15", "16"]/"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]/' ~/.conan2/settings.yml
       - name: Install Conan dependencies
         shell: bash
         run: |