From 15426564d221db4c8fd0b760ad52d9c6a959421b Mon Sep 17 00:00:00 2001 From: "Christoph \"SuperVirus\" Heitkamp" Date: Sun, 6 Dec 2020 16:34:41 +0100 Subject: [PATCH 1/3] Updated build workflow to work with branches, as well --- .github/workflows/windows.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 55a013b0..f869ea76 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -2,8 +2,6 @@ name: Build windows wheels on: push: - branches: - - master create: workflow_dispatch: @@ -41,15 +39,13 @@ jobs: cmake -DCMAKE_INSTALL_PREFIX=c:/mariadb-connector -DCMAKE_INSTALL_COMPONENT=Development -DCMAKE_BUILD_TYPE=Release -P cmake_install.cmake - name: Checkout mysqlclient - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: - ref: master - fetch-depth: 10 path: mysqlclient - name: Site Config shell: bash - working-directory: ../mysqlclient + working-directory: mysqlclient run: | pwd find . @@ -62,7 +58,7 @@ jobs: - name: Build wheels shell: cmd - working-directory: ../mysqlclient + working-directory: mysqlclient run: | py -3.9 -m pip install -U setuptools wheel pip py -3.9 setup.py bdist_wheel @@ -74,14 +70,14 @@ jobs: py -3.6 setup.py bdist_wheel - name: Upload Wheel - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: win-wheels - path: ../mysqlclient/dist + path: mysqlclient/dist/*.whl - name: Check wheels shell: bash - working-directory: ../mysqlclient/dist + working-directory: mysqlclient/dist run: | ls -la py -3.9 -m pip install --no-index --find-links . mysqlclient From 0ef164e563b36513b1d8e7ebcda1f5f0b963121a Mon Sep 17 00:00:00 2001 From: "Christoph \"SuperVirus\" Heitkamp" Date: Sun, 6 Dec 2020 16:39:06 +0100 Subject: [PATCH 2/3] Changed Cache key to use CONNECTOR_VERSION --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index f869ea76..459a9033 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -17,7 +17,7 @@ jobs: uses: actions/cache@v1 with: path: c:/mariadb-connector - key: mariadb-connector-${CONNECTOR_VERSION}-win + key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win - name: Download and Unzip Connector if: steps.cache-connector.outputs.cache-hit != 'true' From a93a2184c0f1f4e4965e3dd055431a291a078f7d Mon Sep 17 00:00:00 2001 From: "Christoph \"SuperVirus\" Heitkamp" Date: Sun, 6 Dec 2020 16:55:37 +0100 Subject: [PATCH 3/3] Reverted back to connector 3.1.9, as newer versions result in link errors --- .github/workflows/windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 459a9033..abf9b9ea 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -9,7 +9,7 @@ jobs: build: runs-on: windows-latest env: - CONNECTOR_VERSION: "3.1.11" + CONNECTOR_VERSION: "3.1.9" steps: - name: Cache Connector