diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49c42bc..486b516 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,17 @@ jobs: Autogenerated by github action, developer should edit as required before publishing... env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: save_upload_url + shell: bash + run: | + echo ${{ steps.create_release.outputs.upload_url }} > upload_url.txt + + - name: Upload upload_url.txt + uses: actions/upload-artifact@v1 + with: + name: save_upload_url + path: upload_url.txt publish_to_pypi: runs-on: ubuntu-latest @@ -56,13 +67,23 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@master with: - username: __token__ + user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} build-and-publish-mac: runs-on: macos-latest steps: + + - name: download_url + uses: actions/download-artifact@v1 + with: + name: save_upload_url + + - shell: bash + run: | + upload_url=`cat upload_url.txt` + - name: Checkout uses: actions/checkout@v2 @@ -92,13 +113,13 @@ jobs: pip install -r requirements.txt pip install . pyinstaller -F -n meshtastic --collect-all meshtastic --codesign-identity "$MACOS_SIGNING_IDENTITY" meshtastic/__main__.py - + - name: Add mac to release uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ jobs.create_release.outputs.upload_url }} + upload_url: ${{ upload_url }} asset_path: dist/meshtastic_mac asset_name: meshtastic_mac asset_content_type: application/zip @@ -106,6 +127,16 @@ jobs: build-and-publish-ubuntu: runs-on: ubuntu-latest steps: + + - name: download_url + uses: actions/download-artifact@v1 + with: + name: save_upload_url + + - shell: bash + run: | + upload_url=`cat upload_url.txt` + - name: Checkout uses: actions/checkout@v2 @@ -126,7 +157,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ jobs.create_release.outputs.upload_url }} + upload_url: ${{ upload_url }} asset_path: dist/meshtastic_ubuntu asset_name: meshtastic_ubuntu asset_content_type: application/zip @@ -134,6 +165,16 @@ jobs: build-and-publish-windows: runs-on: windows-latest steps: + + - name: download_url + uses: actions/download-artifact@v1 + with: + name: save_upload_url + + - shell: bash + run: | + upload_url=`cat upload_url.txt` + - name: Checkout uses: actions/checkout@v2 @@ -154,7 +195,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ jobs.create_release.outputs.upload_url }} + upload_url: ${{ upload_url }} asset_path: dist/meshtastic_windows asset_name: meshtastic_windows asset_content_type: application/zip