Skip to content

Commit 55bd9b7

Browse files
TwonTwon
committed
Restore original installation order across all workflows
1 parent 8db9fd8 commit 55bd9b7

5 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎.github/workflows/clang-tidy.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v6.0.2
3333

34-
- name: Setup Python
35-
uses: ./.github/actions/setup-python
36-
37-
- name: Cache Conan Restore
38-
uses: ./.github/actions/conan-cache-restore
39-
with:
40-
os: Linux
41-
build-type: ${{ env.BUILD_TYPE }}
42-
conan-compiler: clang
43-
compiler-version: ${{ env.COMPILER_VERSION }}
44-
stdlib: ${{ env.STDLIB }}
45-
4634
- name: Install Clang
4735
shell: bash
4836
run: |
@@ -55,6 +43,18 @@ jobs:
5543
sudo ln -s /usr/bin/clang-tidy-${{ env.COMPILER_VERSION }} /usr/bin/clang-tidy
5644
sudo apt install -y libc++-${{ env.COMPILER_VERSION }}-dev libc++abi-${{ env.COMPILER_VERSION }}-dev libunwind-${{ env.COMPILER_VERSION }}-dev
5745
46+
- name: Setup Python
47+
uses: ./.github/actions/setup-python
48+
49+
- name: Cache Conan Restore
50+
uses: ./.github/actions/conan-cache-restore
51+
with:
52+
os: Linux
53+
build-type: ${{ env.BUILD_TYPE }}
54+
conan-compiler: clang
55+
compiler-version: ${{ env.COMPILER_VERSION }}
56+
stdlib: ${{ env.STDLIB }}
57+
5858
- name: Setup Conan
5959
uses: ./.github/actions/setup-conan
6060
with:

‎.github/workflows/cmake.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,14 @@ jobs:
206206
steps:
207207
- uses: actions/checkout@v6.0.2
208208

209+
- name: Install Compiler
210+
uses: ./.github/actions/setup-compiler
211+
with:
212+
compiler-type: ${{ matrix.settings.compiler.type }}
213+
compiler-version: ${{ matrix.settings.compiler.version }}
214+
stdlib: ${{ matrix.settings.lib || '' }}
215+
os: ${{ matrix.settings.os }}
216+
209217
- name: Setup Python
210218
uses: ./.github/actions/setup-python
211219

@@ -218,14 +226,6 @@ jobs:
218226
compiler-version: ${{ matrix.settings.compiler.version }}
219227
stdlib: ${{ matrix.settings.lib || '' }}
220228

221-
- name: Install Compiler
222-
uses: ./.github/actions/setup-compiler
223-
with:
224-
compiler-type: ${{ matrix.settings.compiler.type }}
225-
compiler-version: ${{ matrix.settings.compiler.version }}
226-
stdlib: ${{ matrix.settings.lib || '' }}
227-
os: ${{ matrix.settings.os }}
228-
229229
- name: Setup Conan
230230
uses: ./.github/actions/setup-conan
231231
with:

‎.github/workflows/code_coverage.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v6.0.2
3737

38-
- name: Setup Python
39-
uses: ./.github/actions/setup-python
40-
41-
- name: Cache Conan Restore
42-
uses: ./.github/actions/conan-cache-restore
43-
with:
44-
os: Linux
45-
build-type: ${{ env.BUILD_TYPE }}
46-
conan-compiler: gcc
47-
compiler-version: ${{ env.COMPILER_VERSION }}
48-
stdlib: libstdc++11
49-
5038
- name: Install Latest GCC
5139
shell: bash
5240
run: |
@@ -65,6 +53,18 @@ jobs:
6553
sudo perl -MCPAN -e 'install Capture::Tiny'
6654
sudo apt-get install -y libdatetime-perl
6755
56+
- name: Setup Python
57+
uses: ./.github/actions/setup-python
58+
59+
- name: Cache Conan Restore
60+
uses: ./.github/actions/conan-cache-restore
61+
with:
62+
os: Linux
63+
build-type: ${{ env.BUILD_TYPE }}
64+
conan-compiler: gcc
65+
compiler-version: ${{ env.COMPILER_VERSION }}
66+
stdlib: libstdc++11
67+
6868
- name: Setup Conan
6969
uses: ./.github/actions/setup-conan
7070
with:

‎.github/workflows/documentation.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v6.0.2
3737

38+
- name: Install Compiler
39+
uses: ./.github/actions/setup-compiler
40+
with:
41+
compiler-type: GCC
42+
compiler-version: ${{ env.COMPILER_VERSION }}
43+
stdlib: libstdc++11
44+
os: Linux
45+
3846
- name: Setup Python
3947
uses: ./.github/actions/setup-python
4048

@@ -48,14 +56,6 @@ jobs:
4856
stdlib: libstdc++11
4957
cache-suffix: "-documentation"
5058

51-
- name: Install Compiler
52-
uses: ./.github/actions/setup-compiler
53-
with:
54-
compiler-type: GCC
55-
compiler-version: ${{ env.COMPILER_VERSION }}
56-
stdlib: libstdc++11
57-
os: Linux
58-
5959
- name: Setup Conan
6060
uses: ./.github/actions/setup-conan
6161
with:

‎.github/workflows/iwyu.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v6.0.2
3333

34-
- name: Setup Python
35-
uses: ./.github/actions/setup-python
36-
37-
- name: Cache Conan Restore
38-
uses: ./.github/actions/conan-cache-restore
39-
with:
40-
os: Linux
41-
build-type: ${{ env.BUILD_TYPE }}
42-
conan-compiler: clang
43-
compiler-version: ${{ env.COMPILER_VERSION }}
44-
stdlib: ${{ env.STDLIB }}
45-
4634
- name: Install Clang and IWYU
4735
shell: bash
4836
run: |
@@ -59,6 +47,18 @@ jobs:
5947
cmake --build build
6048
sudo cmake --install build
6149
50+
- name: Setup Python
51+
uses: ./.github/actions/setup-python
52+
53+
- name: Cache Conan Restore
54+
uses: ./.github/actions/conan-cache-restore
55+
with:
56+
os: Linux
57+
build-type: ${{ env.BUILD_TYPE }}
58+
conan-compiler: clang
59+
compiler-version: ${{ env.COMPILER_VERSION }}
60+
stdlib: ${{ env.STDLIB }}
61+
6262
- name: Setup Conan
6363
uses: ./.github/actions/setup-conan
6464
with:

0 commit comments

Comments
 (0)