diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/on-release-master.yml | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/.github/workflows/on-release-master.yml b/.github/workflows/on-release-master.yml index d160f83..a77fd35 100644 --- a/.github/workflows/on-release-master.yml +++ b/.github/workflows/on-release-master.yml @@ -15,6 +15,9 @@ env: RELEASE_UPLOAD_URL: "release_upload_url" ASSET_EXTENSION: ".zip" OUT_NAME_FILE: "TIDAL-Downloader-NG" + ARCH_MACOS_X64: "macos-x64" + ARCH_LINUX_X64: "linux-x64" + ARCH_WINDOWS_X64: "windows-x64" jobs: publish: @@ -77,11 +80,17 @@ jobs: outputs: ASSET_EXTENSION: ${{ env.ASSET_EXTENSION }} OUT_NAME_FILE: ${{ env.OUT_NAME_FILE }} + ARCH_MACOS_X64: ${{ env.ARCH_MACOS_X64 }} + ARCH_LINUX_X64: ${{ env.ARCH_LINUX_X64 }} + ARCH_WINDOWS_X64: ${{ env.ARCH_WINDOWS_X64 }} steps: - name: Compute outputs run: | echo "ASSET_EXTENSION=${{ env.ASSET_EXTENSION }}" >> $GITHUB_OUTPUT echo "OUT_NAME_FILE=${{ env.OUT_NAME_FILE }}" >> $GITHUB_OUTPUT + echo "ARCH_MACOS_X64=${{ env.ARCH_MACOS_X64 }}" >> $GITHUB_OUTPUT + echo "ARCH_LINUX_X64=${{ env.ARCH_LINUX_X64 }}" >> $GITHUB_OUTPUT + echo "ARCH_WINDOWS_X64=${{ env.ARCH_WINDOWS_X64 }}" >> $GITHUB_OUTPUT build-gui-and-upload-assets: needs: ["publish", "compute"] env: @@ -93,39 +102,43 @@ jobs: include: - os: "macos-11" TARGET: "macos-11" + OS_ARCH: ${{needs.compute.outputs.ARCH_MACOS_X64}} CMD_BUILD: > brew install create-dmg && source .venv/bin/activate && poetry run make gui-macos && cd dist && - zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" && - cd .. - - os: "macos-13" - TARGET: "macos-13" - CMD_BUILD: > - brew install create-dmg && - source .venv/bin/activate && - poetry run make gui-macos && - cd dist && - zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" && + zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" && cd .. + # TODO: Use M1 runner. + # - os: "macos-13" + # TARGET: "macos-13" + # CMD_BUILD: > + # brew install create-dmg && + # source .venv/bin/activate && + # poetry run make gui-macos && + # cd dist && + # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" && + # cd .. - os: "ubuntu-20.04" TARGET: "ubuntu-20.04" + OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}} CMD_BUILD: > source .venv/bin/activate && poetry run make gui && cd dist && - zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} && + zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} && cd .. - os: "windows-2019" TARGET: "windows-2019" + OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}} CMD_BUILD: > choco feature enable -n=allowGlobalConfirmation choco install zip make source .venv/bin/activate && - poetry run make gui && + C:\Users\runneradmin\.local\bin\poetry run make gui && cd dist && - zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe && + zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe && cd .. runs-on: ${{ matrix.os }} steps: @@ -160,8 +173,8 @@ jobs: id: get_release_info shell: bash run: | - value=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt` - echo ::set-output name=upload_url::$value + VALUE=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt` + echo "upload_url=$VALUE" >> $GITHUB_OUTPUT - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -169,6 +182,6 @@ jobs: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} with: upload_url: ${{steps.get_release_info.outputs.upload_url}} - asset_path: ./dist/${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} - asset_name: ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} + asset_path: ./dist/${{needs.compute.outputs.OUT_NAME_FILE}}_OS_ARCH_${{needs.compute.outputs.ASSET_EXTENSION}} + asset_name: ${{needs.compute.outputs.OUT_NAME_FILE}}_OS_ARCH_${{needs.compute.outputs.ASSET_EXTENSION}} asset_content_type: ${{env.ASSET_MIME}} |