Skip to content

Commit dfb6b08

Browse files
committed
Stop installing packages that are already installed
1 parent 06a71df commit dfb6b08

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

.github/workflows/linux-meson-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Prepare environment
2525
run: |
2626
sudo apt-get update
27-
sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
27+
sudo apt-get install -y meson ${{matrix.other_pkgs}}
2828
2929
- name: Configure
3030
env:

.github/workflows/linux-other-builds.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,45 @@ jobs:
2121
build_description: Surrogates build
2222
build_type: Debug
2323
std: 14
24-
other_pkgs: clang-14
2524
cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
2625

2726
# Extras and examples with gcc-11
2827
- cxx: g++-11
2928
build_description: Extras + Examples
3029
build_type: Debug
3130
std: 14
32-
other_pkgs: g++-11
3331
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
3432
- cxx: g++-11
3533
build_description: Extras + Examples
3634
build_type: Release
3735
std: 14
38-
other_pkgs: g++-11
3936
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
4037

4138
# Extras and examples with Clang-14
4239
- cxx: clang++-14
4340
build_description: Extras + Examples
4441
build_type: Debug
4542
std: 17
46-
other_pkgs: clang-14
4743
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
4844
- cxx: clang++-14
4945
build_description: Extras + Examples
5046
build_type: Release
5147
std: 17
52-
other_pkgs: clang-14
5348
cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
5449

5550
# Configure tests with Clang-14
5651
- cxx: clang++-14
5752
build_description: CMake configuration tests
5853
build_type: Debug
5954
std: 14
60-
other_pkgs: clang-14
6155
cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
6256

6357
# Valgrind test Clang-14
6458
# - cxx: clang++-14
6559
# build_description: Valgrind tests
6660
# build_type: Debug
6761
# std: 14
68-
# other_pkgs: clang-14 valgrind
62+
# other_pkgs: valgrind
6963
# cmake_configurations: -DMEMORYCHECK_COMMAND=`which valgrind` -DMEMORYCHECK_COMMAND_OPTIONS="-q --track-origins=yes --leak-check=full --num-callers=50 --show-leak-kinds=definite --error-exitcode=1"
7064
# other_ctest_args: -T memcheck -LE uses-python
7165

@@ -76,7 +70,7 @@ jobs:
7670
- name: Prepare environment
7771
run: |
7872
sudo apt-get update
79-
sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
73+
sudo apt-get install -y ${{matrix.other_pkgs}}
8074
8175
- name: Configure build
8276
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
@@ -100,11 +94,6 @@ jobs:
10094
steps:
10195
- uses: actions/checkout@v4
10296

103-
- name: Prepare environment
104-
run: |
105-
sudo apt-get update
106-
sudo apt-get install -y ninja-build clang-15 clang-tidy-15
107-
10897
- name: Configure
10998
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
11099
# This is important

.github/workflows/linux-simple-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
- name: Prepare environment
9696
run: |
9797
sudo apt-get update
98-
sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
98+
sudo apt-get install -y ${{matrix.other_pkgs}}
9999
100100
- name: Configure
101101
# Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.

0 commit comments

Comments
 (0)