Skip to content

Commit 611adf1

Browse files
committed
fixup
1 parent f608805 commit 611adf1

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

.github/workflows/windows.yaml

+21-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/cache@v4
1818
with:
1919
path: c:/mariadb-connector
20-
key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win-1
20+
key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win-2
2121

2222
- name: Download and Unzip Connector
2323
if: steps.cache-connector.outputs.cache-hit != 'true'
@@ -27,18 +27,32 @@ jobs:
2727
unzip "mariadb-connector-c-${CONNECTOR_VERSION}-src.zip" -d c:/
2828
mv "c:/mariadb-connector-c-${CONNECTOR_VERSION}-src" c:/mariadb-connector-src
2929
30-
- name: Build Connector
30+
- name: make build directory
3131
if: steps.cache-connector.outputs.cache-hit != 'true'
3232
shell: cmd
3333
working-directory: c:/mariadb-connector-src
3434
run: |
3535
mkdir build
36-
cd build
37-
cmake -A x64 .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static \
38-
-DCLIENT_PLUGIN_SHA256_PASSWORD=static \
39-
-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static \
40-
-DDEFAULT_SSL_VERIFY_SERVER_CERT=0
36+
37+
- name: cmake
38+
if: steps.cache-connector.outputs.cache-hit != 'true'
39+
shell: cmd
40+
working-directory: c:/mariadb-connector-src/build
41+
run: |
42+
cmake -A x64 .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static -DCLIENT_PLUGIN_SHA256_PASSWORD=static -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static -DDEFAULT_SSL_VERIFY_SERVER_CERT=0
43+
44+
- name: cmake build
45+
if: steps.cache-connector.outputs.cache-hit != 'true'
46+
shell: cmd
47+
working-directory: c:/mariadb-connector-src/build
48+
run: |
4149
cmake --build . -j 8 --config Release
50+
51+
- name: cmake install
52+
if: steps.cache-connector.outputs.cache-hit != 'true'
53+
shell: cmd
54+
working-directory: c:/mariadb-connector-src/build
55+
run: |
4256
cmake -DCMAKE_INSTALL_PREFIX=c:/mariadb-connector -DCMAKE_INSTALL_COMPONENT=Development -DCMAKE_BUILD_TYPE=Release -P cmake_install.cmake
4357
4458
- name: Checkout mysqlclient

0 commit comments

Comments
 (0)