Skip to content

Commit 45ca1a2

Browse files
authored
GitHub Actions workflow updated and caching fixed, Revert back to MariaDB Connector C 3.1.9 (#455)
1 parent 200b4a8 commit 45ca1a2

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

.github/workflows/windows.yaml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@ name: Build windows wheels
22

33
on:
44
push:
5-
branches:
6-
- master
75
create:
86
workflow_dispatch:
97

108
jobs:
119
build:
1210
runs-on: windows-latest
1311
env:
14-
CONNECTOR_VERSION: "3.1.11"
12+
CONNECTOR_VERSION: "3.1.9"
1513
steps:
1614

1715
- name: Cache Connector
1816
id: cache-connector
1917
uses: actions/cache@v1
2018
with:
2119
path: c:/mariadb-connector
22-
key: mariadb-connector-${CONNECTOR_VERSION}-win
20+
key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win
2321

2422
- name: Download and Unzip Connector
2523
if: steps.cache-connector.outputs.cache-hit != 'true'
@@ -41,15 +39,13 @@ jobs:
4139
cmake -DCMAKE_INSTALL_PREFIX=c:/mariadb-connector -DCMAKE_INSTALL_COMPONENT=Development -DCMAKE_BUILD_TYPE=Release -P cmake_install.cmake
4240
4341
- name: Checkout mysqlclient
44-
uses: actions/checkout@v1
42+
uses: actions/checkout@v2
4543
with:
46-
ref: master
47-
fetch-depth: 10
4844
path: mysqlclient
4945

5046
- name: Site Config
5147
shell: bash
52-
working-directory: ../mysqlclient
48+
working-directory: mysqlclient
5349
run: |
5450
pwd
5551
find .
@@ -62,7 +58,7 @@ jobs:
6258
6359
- name: Build wheels
6460
shell: cmd
65-
working-directory: ../mysqlclient
61+
working-directory: mysqlclient
6662
run: |
6763
py -3.9 -m pip install -U setuptools wheel pip
6864
py -3.9 setup.py bdist_wheel
@@ -74,14 +70,14 @@ jobs:
7470
py -3.6 setup.py bdist_wheel
7571
7672
- name: Upload Wheel
77-
uses: actions/upload-artifact@v1
73+
uses: actions/upload-artifact@v2
7874
with:
7975
name: win-wheels
80-
path: ../mysqlclient/dist
76+
path: mysqlclient/dist/*.whl
8177

8278
- name: Check wheels
8379
shell: bash
84-
working-directory: ../mysqlclient/dist
80+
working-directory: mysqlclient/dist
8581
run: |
8682
ls -la
8783
py -3.9 -m pip install --no-index --find-links . mysqlclient

0 commit comments

Comments
 (0)