Skip to content

Commit a0ab146

Browse files
committed
fix(ci) disable webready and curl for release builds [ci skip]
1 parent 08a68c3 commit a0ab146

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
sudo apt-get install ninja-build gettext doxygen graphviz
25-
pip3 install conan==1.45.0
25+
pip3 install conan==1.48.1
2626
2727
- name: Conan common config
2828
run: |
@@ -39,7 +39,7 @@ jobs:
3939
4040
- name: Build packaged release
4141
run: |
42-
cmake --preset linux-all -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
42+
cmake --preset linux-all -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF
4343
cmake --build build -t doc
4444
cmake --build build -t package
4545
@@ -105,20 +105,28 @@ jobs:
105105
- name: Set up Python
106106
uses: actions/setup-python@v3
107107
with:
108-
python-version: 3.9
108+
python-version: 3.7
109109

110110
- name: Install doxygen
111111
run: |
112112
choco install doxygen.install
113113
choco install graphviz
114114
115+
- name: Restore conan cache
116+
uses: actions/cache@v2
117+
with:
118+
path: ${{github.workspace}}/conanCache
119+
key: ${{runner.os}}-release-win-${{ hashFiles('conanfile.py') }}
120+
115121
- name: Install Conan & Common config
116122
run: |
117-
pip.exe install "conan==1.45.0"
123+
pip.exe install "conan==1.48.1"
118124
conan profile new --detect default
125+
conan profile show default
119126
conan profile update settings.build_type=Release default
120127
conan profile update settings.compiler="Visual Studio" default
121128
conan profile update settings.compiler.version=17 default
129+
conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
122130
123131
- name: Run Conan
124132
run: |
@@ -128,9 +136,9 @@ jobs:
128136
129137
- name: Build packaged release
130138
run: |
131-
cmake --preset win-release -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DEXIV2_BUILD_DOC=ON
132-
cmake --build build -t doc
133-
cmake --build build -t package
139+
cmake --preset win-release -S . -B build -DEXIV2_TEAM_PACKAGING=ON -DEXIV2_BUILD_DOC=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF
140+
cmake --build build --parallel -t doc
141+
cmake --build build --parallel -t package
134142
135143
- uses: actions/upload-artifact@v3
136144
with:

0 commit comments

Comments
 (0)