Merge pull request #1682 from pybamm-team/main-fix-merge

Main fix merge

Author: valentinsulzer

.github/workflows/build_sdist.yml

@@ -1,13 +1,14 @@
-name: "Build and publish python sdist"
+name: "Build and publish Python sdist"
 
 on:
-  push:
-    branches: main
   workflow_dispatch:
     inputs:
       target:
         description: 'Deployment target. Can be "pypi" or "testpypi"'
         default: 'pypi'
+  workflow_run:
+    workflows: ["Build and publish Python wheels"]
+    types: [completed]
 
 jobs:
   build_sdist:
@@ -16,7 +17,9 @@ jobs:
     strategy:
       matrix:
         python-version: [3.8]
-
+    if: |
+      ${{ github.event.workflow_run.conclusion == 'success' }} ||
+      github.event_name == 'workflow_dispatch'
     steps:
       - uses: actions/checkout@v2
 
@@ -29,15 +32,13 @@ jobs:
         run: pip install wheel
 
       - name: Build sdist
-        run: python setup.py sdist --formats=gztar,zip
+        run: python setup.py sdist --formats=gztar
 
       - name: Upload sdist
         uses: actions/upload-artifact@v2
         with:
           name: files
-          path: |
-            ./dist/*.tar.gz
-            ./dist/*.zip
+          path: ./dist/*.tar.gz
           if-no-files-found: error
 
 
@@ -53,7 +54,9 @@ jobs:
           path: sdist
 
       - name: Publish sdist on PyPI
-        if: github.event.inputs.target == 'pypi'
+        if: |
+          github.event.inputs.target == 'pypi' ||
+          (github.event_name == 'push' && github.ref == 'refs/heads/main')
         uses: pypa/gh-action-pypi-publish@master
         with:
           user: __token__

.github/workflows/build_wheels.yml

@@ -81,7 +81,9 @@ jobs:
           name: wheels
 
       - name: Publish wheels on PyPI
-        if: github.event.inputs.target == 'pypi'
+        if: |
+          github.event.inputs.target == 'pypi' ||
+          (github.event_name == 'push' && github.ref == 'refs/heads/main')
         uses: pypa/gh-action-pypi-publish@master
         with:
           user: __token__

vcpkg-configuration.json

@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "builtin",
-    "baseline": "642d1ccb276ce13d8a8521b1ef2856f5f7bc9cdd"
+    "baseline": "e201002b4f4827d7b7b672f0c5c672a77fc3b77d"
   },
   "registries": [
     {