Merge branch 'master' into develop

molinav · molinav · commit 191688f1b9db · 2021-12-08T17:21:16.000+01:00
diff --git a/.github/workflows/basemap-for-windows.yml b/.github/workflows/basemap-for-windows.yml
@@ -148,7 +148,6 @@ jobs:
         arch:
           [
             "x64",
-            "x86",
           ]
         python-version:
           [
@@ -190,9 +189,7 @@ jobs:
           TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
           TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
         run: |
-          python -m twine check                                               \
-              ${{ env.PKGDIR }}/dist/*.zip                                    \
+          python -m twine check                                               `
               ${{ env.PKGDIR }}/dist/*-win*.whl
-          python -m twine upload --skip-existing                              \
-              ${{ env.PKGDIR }}/dist/*.zip                                    \
+          python -m twine upload --skip-existing                              `
               ${{ env.PKGDIR }}/dist/*-win*.whl

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ jobs:`
`148`	`148`	`arch:`
`149`	`149`	`[`
`150`	`150`	`"x64",`
`151`		`- "x86",`
`152`	`151`	`]`
`153`	`152`	`python-version:`
`154`	`153`	`[`
`@@ -190,9 +189,7 @@ jobs:`
`190`	`189`	`TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"`
`191`	`190`	`TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"`
`192`	`191`	`run: \|`
`193`		`- python -m twine check \`
`194`		`- ${{ env.PKGDIR }}/dist/*.zip \`
	`192`	+ python -m twine check `
`195`	`193`	`${{ env.PKGDIR }}/dist/-win.whl`
`196`		`- python -m twine upload --skip-existing \`
`197`		`- ${{ env.PKGDIR }}/dist/*.zip \`
	`194`	+ python -m twine upload --skip-existing `
`198`	`195`	`${{ env.PKGDIR }}/dist/-win.whl`