diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a7f651d378..1f8fc40e3b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,8 +40,7 @@ jobs: - name: Install dependencies run: | - sudo apt-get update - sudo apt-get install -y libexpat1-dev zlib1g-dev libbrotli-dev libinih-dev + sudo eatmydata apt-get -y install libexpat1-dev zlib1g-dev libbrotli-dev libinih-dev # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index 283aa8eda4..1cffe14d59 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - sudo apt install -y tree - python3 -m pip install conan==1.* ninja + sudo apt install -y tree ninja-build + python3 -m pip install conan==1.* - name: Conan common config run: | diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml index 55492685d6..be2db5bdd1 100644 --- a/.github/workflows/on_PR_linux_special_builds.yml +++ b/.github/workflows/on_PR_linux_special_builds.yml @@ -21,10 +21,10 @@ jobs: fetch-depth: 2 # Trying to deal with warning: -> Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0 - - name: install dependencies + - name: Install dependencies run: | - sudo apt-get install -y libxml2-dev libxslt-dev python3-dev - python3 -m pip install conan==1.* gcovr ninja + sudo eatmydata apt-get -y install libxml2-dev libxslt-dev python3-dev ninja-build gcovr + python3 -m pip install conan==1.* - name: Conan common config run: | @@ -66,10 +66,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - sudo apt install -y valgrind - python3 -m pip install conan==1.* ninja + sudo apt install -y valgrind ninja-build + python3 -m pip install conan==1.* - name: Conan common config run: | @@ -101,9 +101,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - python3 -m pip install conan==1.* ninja + sudo apt install -y ninja-build + python3 -m pip install conan==1.* - name: Conan common config run: | @@ -134,10 +135,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - sudo apt install -y valgrind doxygen graphviz gettext - python3 -m pip install conan==1.* ninja + sudo apt install -y valgrind doxygen graphviz gettext ninja-build + python3 -m pip install conan==1.* - name: Conan common config run: | diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml index 5a9c537ec8..fa77859c9a 100644 --- a/.github/workflows/on_PR_linux_staticAnalysis.yml +++ b/.github/workflows/on_PR_linux_staticAnalysis.yml @@ -21,7 +21,7 @@ jobs: fetch-depth: 2 # Trying to deal with warning: -> Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0 - - name: install dependencies + - name: Install dependencies run: | python3 -m pip install conan==1.* sudo add-apt-repository ppa:ubuntu-lxc/daily -y diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml index 3311f2903e..ef5d2286d7 100644 --- a/.github/workflows/on_PR_mac_matrix.yml +++ b/.github/workflows/on_PR_mac_matrix.yml @@ -11,7 +11,7 @@ on: jobs: MacOS: - name: 'MacOS - clang, BuildType:${{matrix.build_type}}, SHARED:${{matrix.shared_libraries}}' + name: 'macOS - XCode - ${{matrix.build_type}} - SHARED:${{matrix.shared_libraries}}' runs-on: macos-latest strategy: @@ -23,11 +23,9 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - brew install ninja - brew install inih - brew install googletest + brew install ninja inih googletest - name: Build run: | @@ -41,5 +39,4 @@ jobs: - name: Test run: | - cd build - ctest --output-on-failure + ctest --test-dir build --output-on-failure diff --git a/.github/workflows/on_PR_mac_special_builds.yml b/.github/workflows/on_PR_mac_special_builds.yml index 67e7656253..f03bf0b02c 100644 --- a/.github/workflows/on_PR_mac_special_builds.yml +++ b/.github/workflows/on_PR_mac_special_builds.yml @@ -12,24 +12,21 @@ on: jobs: MacOS_releaseSanitizers: - name: 'MacOS - Clang - Release+Sanitizers' + name: 'macOS - XCode - Release+Sanitizers' runs-on: macos-latest steps: - uses: actions/checkout@v4 - - name: install dependencies + - name: Install dependencies run: | - brew install ninja - brew install inih - brew install googletest + brew install ninja inih googletest - name: Build run: | cmake --preset base_mac -S . -B build -DEXIV2_TEAM_USE_SANITIZERS=ON cmake --build build --parallel - - name: Tests + - name: Test run: | - cd build - ctest --output-on-failure + ctest --test-dir build --output-on-failure diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 0e4128d7b2..533cb614de 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -94,9 +94,7 @@ jobs: - name: Install dependencies run: | - brew install ninja - brew install inih - brew install googletest + brew install ninja inih googletest - name: Build run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5e18442c3..e65589d97e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,8 @@ jobs: - name: Install dependencies run: | - sudo apt install -y gettext doxygen graphviz - python -m pip install conan==1.* ninja + sudo apt install -y gettext doxygen graphviz ninja-build + python -m pip install conan==1.* - name: Conan common config run: | @@ -129,7 +129,7 @@ jobs: - name: Build packaged release run: | - cmake --preset win-release -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DEXIV2_BUILD_DOC=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_BUILD_SAMPLES=OFF + cmake --preset win-release -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DEXIV2_BUILD_DOC=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF cmake --build build --parallel -t doc cmake --build build --parallel -t package