From 3b5ca32ba79f2d37d3693193c88fcd044b7c6689 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 15:13:29 +0000 Subject: [PATCH 1/3] Bump actions/cache from 2 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/on_PR_windows_matrix.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 9c1b93a32e..5ec5843d19 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -48,7 +48,7 @@ jobs: python-version: 3.7 - name: Restore Conan cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{github.workspace}}/conanCache key: ${{runner.os}}-${{matrix.platform}}-${{matrix.build_type}}-Shared${{matrix.shared_libraries}}-${{ hashFiles('conanfile.py') }} diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 8e79fd0820..c056410e65 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -38,7 +38,7 @@ jobs: python-version: 3.7 - name: Restore conan cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{github.workspace}}/conanCache key: ${{runner.os}}-push-win-${{ hashFiles('conanfile.py') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c759ade746..41ab6cbaf3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -117,7 +117,7 @@ jobs: choco install graphviz - name: Restore conan cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{github.workspace}}/conanCache key: ${{runner.os}}-release-win-${{ hashFiles('conanfile.py') }} From 541b338b9e9d8812d183f436c1298836b54d547d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 22 Feb 2023 09:54:59 -0800 Subject: [PATCH 2/3] github CI: install regular conan Needed for actions/cache update Signed-off-by: Rosen Penev --- .github/workflows/on_PR_linux_matrix.yml | 6 +++--- .github/workflows/on_PR_linux_special_builds.yml | 10 +++++----- .github/workflows/on_PR_linux_staticAnalysis.yml | 6 +++--- .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 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index 6f970e077d..f31d13bae7 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -19,14 +19,14 @@ jobs: matrix: build_type: [Release, Debug] shared_libraries: [ON, OFF] - + steps: - uses: actions/checkout@v3 - name: install dependencies run: | sudo apt-get install ninja-build tree - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan common config run: | @@ -49,7 +49,7 @@ jobs: - name: Install run: | cd build-base_linux - cmake --install . + cmake --install . - name: Test run: | diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml index 1fcd0794d4..4a4f93c7e1 100644 --- a/.github/workflows/on_PR_linux_special_builds.yml +++ b/.github/workflows/on_PR_linux_special_builds.yml @@ -24,7 +24,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 pip3 install gcovr - name: Conan common config @@ -70,7 +70,7 @@ jobs: - name: install dependencies run: | sudo apt-get install valgrind ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan common config run: | @@ -105,7 +105,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan common config run: | @@ -139,7 +139,7 @@ jobs: - name: install dependencies run: | sudo apt-get install valgrind doxygen graphviz gettext ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan common config run: | @@ -155,7 +155,7 @@ jobs: - name: Build run: | - cmake --preset linux-release -S . -B build -DEXIV2_BUILD_DOC=ON -DCMAKE_CXX_FLAGS="-DEXIV2_DEBUG_MESSAGES" + cmake --preset linux-release -S . -B build -DEXIV2_BUILD_DOC=ON -DCMAKE_CXX_FLAGS="-DEXIV2_DEBUG_MESSAGES" cmake --build build --parallel - name: Generate documentation diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml index 338556477f..73a928ca0c 100644 --- a/.github/workflows/on_PR_linux_staticAnalysis.yml +++ b/.github/workflows/on_PR_linux_staticAnalysis.yml @@ -23,7 +23,7 @@ jobs: - name: install dependencies run: | - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 sudo add-apt-repository ppa:ubuntu-lxc/daily -y wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add - sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list @@ -61,5 +61,5 @@ jobs: name: static_analysis path: build/pvsReportHtml retention-days: 7 - - + + diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 5ec5843d19..aab66e171c 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -55,7 +55,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.54.0" + pip install conan==1.55.0 conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=${{matrix.build_type}} default diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index c056410e65..2073063024 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -45,7 +45,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.54.0" + pip install conan==1.55.0 conan profile new --detect default conan profile show default conan profile update settings.compiler="Visual Studio" default @@ -73,7 +73,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan run: | diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index b14f9f271e..946e57ee0e 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -25,7 +25,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 pip3 install gcovr - name: Conan common config diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41ab6cbaf3..07f3942d0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install ninja-build gettext doxygen graphviz - pip3 install conan==1.54.0 + pip3 install conan==1.55.0 - name: Conan common config run: | @@ -124,7 +124,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.54.0" + pip install conan==1.55.0 conan profile new --detect default conan profile show default conan profile update settings.build_type=Release default From 75ab620b08398e0990bbbdaca9c6f38e7a7303d8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 22 Feb 2023 10:07:49 -0800 Subject: [PATCH 3/3] github CI: use python -m pip Calling pip directly is deprecated. Also switched to pip version of ninja. It installs faster and is newer. Signed-off-by: Rosen Penev --- .github/workflows/on_PR_linux_matrix.yml | 4 ++-- .github/workflows/on_PR_linux_special_builds.yml | 15 ++++++--------- .github/workflows/on_PR_linux_staticAnalysis.yml | 6 +++--- .github/workflows/on_PR_windows_matrix.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 5 ++--- .github/workflows/on_push_ExtraJobsForMain.yml | 4 +--- .github/workflows/release.yml | 6 +++--- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index f31d13bae7..68334e10af 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -25,8 +25,8 @@ jobs: - name: install dependencies run: | - sudo apt-get install ninja-build tree - pip3 install conan==1.55.0 + sudo apt install -y tree + python3 -m pip install conan==1.55.0 ninja - 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 4a4f93c7e1..798b8dc32f 100644 --- a/.github/workflows/on_PR_linux_special_builds.yml +++ b/.github/workflows/on_PR_linux_special_builds.yml @@ -23,9 +23,7 @@ jobs: - name: install dependencies run: | - sudo apt-get install ninja-build - pip3 install conan==1.55.0 - pip3 install gcovr + python3 -m pip install conan==1.55.0 gcovr ninja - name: Conan common config run: | @@ -69,8 +67,8 @@ jobs: - name: install dependencies run: | - sudo apt-get install valgrind ninja-build - pip3 install conan==1.55.0 + sudo apt install -y valgrind + python3 -m pip install conan==1.55.0 ninja - name: Conan common config run: | @@ -104,8 +102,7 @@ jobs: - name: install dependencies run: | - sudo apt-get install ninja-build - pip3 install conan==1.55.0 + python3 -m pip install conan==1.55.0 ninja - name: Conan common config run: | @@ -138,8 +135,8 @@ jobs: - name: install dependencies run: | - sudo apt-get install valgrind doxygen graphviz gettext ninja-build - pip3 install conan==1.55.0 + sudo apt install -y valgrind doxygen graphviz gettext + python3 -m pip install conan==1.55.0 ninja - name: Conan common config run: | diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml index 73a928ca0c..2fbbd88390 100644 --- a/.github/workflows/on_PR_linux_staticAnalysis.yml +++ b/.github/workflows/on_PR_linux_staticAnalysis.yml @@ -23,12 +23,12 @@ jobs: - name: install dependencies run: | - pip3 install conan==1.55.0 + python3 -m pip install conan==1.55.0 sudo add-apt-repository ppa:ubuntu-lxc/daily -y wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add - sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list - sudo apt-get update -qq - sudo apt-get install -qq pvs-studio + sudo apt update -qq + sudo apt install -qq pvs-studio - name: Conan common config run: | diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index aab66e171c..4a905a0f2a 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -55,7 +55,7 @@ jobs: - name: Install Conan & Common config run: | - pip install conan==1.55.0 + python -m pip install conan==1.55.0 conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=${{matrix.build_type}} default diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 2073063024..a6b5c920b2 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -45,7 +45,7 @@ jobs: - name: Install Conan & Common config run: | - pip install conan==1.55.0 + python -m pip install conan==1.55.0 conan profile new --detect default conan profile show default conan profile update settings.compiler="Visual Studio" default @@ -72,8 +72,7 @@ jobs: - name: install dependencies run: | - sudo apt-get install ninja-build - pip3 install conan==1.55.0 + python3 -m pip install conan==1.55.0 ninja - name: Conan run: | diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index 946e57ee0e..5f0d2c3e65 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -24,9 +24,7 @@ jobs: - name: install dependencies run: | - sudo apt-get install ninja-build - pip3 install conan==1.55.0 - pip3 install gcovr + python3 -m pip install conan==1.55.0 gcovr ninja - name: Conan common config run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07f3942d0e..aa3eda57b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,8 @@ jobs: - name: Install dependencies run: | - sudo apt-get install ninja-build gettext doxygen graphviz - pip3 install conan==1.55.0 + sudo apt install -y gettext doxygen graphviz + python -m pip install conan==1.55.0 ninja - name: Conan common config run: | @@ -124,7 +124,7 @@ jobs: - name: Install Conan & Common config run: | - pip install conan==1.55.0 + python -m pip install conan==1.55.0 conan profile new --detect default conan profile show default conan profile update settings.build_type=Release default