From 1dcb605a3e4d153c1f4c9dcd69cca3e2d711278f Mon Sep 17 00:00:00 2001 From: mkb79 Date: Wed, 27 Sep 2023 07:55:29 +0200 Subject: [PATCH 1/4] ci: rework build gh action --- .github/workflows/build.yml | 41 ++++++++++++------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c2055f..10e7563 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,12 @@ jobs: createrelease: name: Create Release - runs-on: [ubuntu-latest] + runs-on: ubuntu-latest + outputs: + release_url: ${{ steps.create-release.outputs.upload_url }} steps: - name: Create Release - id: create_release + id: create-release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -21,13 +23,6 @@ jobs: release_name: Release ${{ github.ref }} draft: false prerelease: false - - name: Output Release URL File - run: echo "${{ steps.create_release.outputs.upload_url }}" > release_url.txt - - name: Save Release URL File for publish - uses: actions/upload-artifact@v2 - with: - name: release_url - path: release_url.txt build: name: Build packages @@ -44,13 +39,13 @@ jobs: zip -r9 audible_linux_ubuntu_latest audible OUT_FILE_NAME: audible_linux_ubuntu_latest.zip ASSET_MIME: application/zip # application/octet-stream - - os: ubuntu-18.04 + - os: ubuntu-20.04 TARGET: linux CMD_BUILD: > pyinstaller --clean -F --hidden-import audible_cli -n audible -c pyi_entrypoint.py && cd dist/ && - zip -r9 audible_linux_ubuntu_18_04 audible - OUT_FILE_NAME: audible_linux_ubuntu_18_04.zip + zip -r9 audible_linux_ubuntu_20_04 audible + OUT_FILE_NAME: audible_linux_ubuntu_20_04.zip ASSET_MIME: application/zip # application/octet-stream - os: macos-latest TARGET: macos @@ -85,34 +80,24 @@ jobs: OUT_FILE_NAME: audible_win.zip ASSET_MIME: application/zip steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip .[pyi] && pip list - name: Build with pyinstaller for ${{matrix.TARGET}} run: ${{matrix.CMD_BUILD}} - - name: Load Release URL File from release job - uses: actions/download-artifact@v2 - with: - name: release_url - path: release_url - - name: Get Release File Name & Upload URL - id: get_release_info - shell: bash - run: | - value=`cat release_url/release_url.txt` - echo ::set-output name=upload_url::$value - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_URL: ${{ needs.createrelease.outputs.release_url }} with: - upload_url: ${{ steps.get_release_info.outputs.upload_url }} + upload_url: $RELEASE_URL asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} asset_name: ${{ matrix.OUT_FILE_NAME}} asset_content_type: ${{ matrix.ASSET_MIME}} From c10ed82985b9306878cb3dd9c9e7725e965c5a18 Mon Sep 17 00:00:00 2001 From: mkb79 Date: Wed, 27 Sep 2023 08:40:21 +0200 Subject: [PATCH 2/4] update build.yml --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10e7563..bec68e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,13 @@ jobs: release_name: Release ${{ github.ref }} draft: false prerelease: false + - name: Print release url + run: echo ${{ steps.create-release.outputs.upload_url }} + - name: Print release url File + run: | + echo "${{ steps.create-release.outputs.upload_url }}" > release_url.txt + value=`cat release_url.txt` + echo $value build: name: Build packages From bcde02e6af382767f11234afcc4583b89118261f Mon Sep 17 00:00:00 2001 From: mkb79 Date: Wed, 27 Sep 2023 09:17:56 +0200 Subject: [PATCH 3/4] update build.yml --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bec68e6..ed2796e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,13 +23,6 @@ jobs: release_name: Release ${{ github.ref }} draft: false prerelease: false - - name: Print release url - run: echo ${{ steps.create-release.outputs.upload_url }} - - name: Print release url File - run: | - echo "${{ steps.create-release.outputs.upload_url }}" > release_url.txt - value=`cat release_url.txt` - echo $value build: name: Build packages @@ -104,7 +97,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RELEASE_URL: ${{ needs.createrelease.outputs.release_url }} with: - upload_url: $RELEASE_URL + upload_url: ${{ RELEASE_URL }} asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} asset_name: ${{ matrix.OUT_FILE_NAME}} asset_content_type: ${{ matrix.ASSET_MIME}} From 5902546551fac7f18fc63ae4ae762c10ac895957 Mon Sep 17 00:00:00 2001 From: mkb79 Date: Wed, 27 Sep 2023 09:21:25 +0200 Subject: [PATCH 4/4] update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed2796e..f35811f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,9 +95,8 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_URL: ${{ needs.createrelease.outputs.release_url }} with: - upload_url: ${{ RELEASE_URL }} + upload_url: ${{ needs.createrelease.outputs.release_url }} asset_path: ./dist/${{ matrix.OUT_FILE_NAME}} asset_name: ${{ matrix.OUT_FILE_NAME}} asset_content_type: ${{ matrix.ASSET_MIME}}