Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump actions/cache from 2 to 3 #2517

Merged
merged 3 commits into from
Feb 22, 2023
Merged

Bump actions/cache from 2 to 3 #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5ca32
Bump actions/cache from 2 to 3
dependabot[bot] Feb 22, 2023
541b338
github CI: install regular conan
neheb Feb 22, 2023
75ab620
github CI: use python -m pip
neheb Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/on_PR_linux_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
sudo apt install -y tree
python3 -m pip install conan==1.55.0 ninja

- name: Conan common config
run: |
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Install
run: |
cd build-base_linux
cmake --install .
cmake --install .

- name: Test
run: |
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/on_PR_linux_special_builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.54.0
pip3 install gcovr
python3 -m pip install conan==1.55.0 gcovr ninja

- name: Conan common config
run: |
Expand Down Expand Up @@ -69,8 +67,8 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install valgrind ninja-build
pip3 install conan==1.54.0
sudo apt install -y valgrind
python3 -m pip install conan==1.55.0 ninja

- name: Conan common config
run: |
Expand Down Expand Up @@ -104,8 +102,7 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.54.0
python3 -m pip install conan==1.55.0 ninja

- name: Conan common config
run: |
Expand Down Expand Up @@ -138,8 +135,8 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install valgrind doxygen graphviz gettext ninja-build
pip3 install conan==1.54.0
sudo apt install -y valgrind doxygen graphviz gettext
python3 -m pip install conan==1.55.0 ninja

- name: Conan common config
run: |
Expand All @@ -155,7 +152,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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/on_PR_linux_staticAnalysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

- name: install dependencies
run: |
pip3 install conan==1.54.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: |
Expand Down Expand Up @@ -61,5 +61,5 @@ jobs:
name: static_analysis
path: build/pvsReportHtml
retention-days: 7


4 changes: 2 additions & 2 deletions .github/workflows/on_PR_windows_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ 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') }}

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.54.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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/on_push_BasicWinLinMac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ 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') }}

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.54.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
Expand All @@ -72,8 +72,7 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.54.0
python3 -m pip install conan==1.55.0 ninja

- name: Conan
run: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/on_push_ExtraJobsForMain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ jobs:

- name: install dependencies
run: |
sudo apt-get install ninja-build
pip3 install conan==1.54.0
pip3 install gcovr
python3 -m pip install conan==1.55.0 gcovr ninja

- name: Conan common config
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get install ninja-build gettext doxygen graphviz
pip3 install conan==1.54.0
sudo apt install -y gettext doxygen graphviz
python -m pip install conan==1.55.0 ninja

- name: Conan common config
run: |
Expand Down Expand Up @@ -117,14 +117,14 @@ 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') }}

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.54.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
Expand Down