diff --git a/.github/workflows/build_deb_pkg.yml b/.github/workflows/build_deb_pkg.yml index 65119c3..944b442 100644 --- a/.github/workflows/build_deb_pkg.yml +++ b/.github/workflows/build_deb_pkg.yml @@ -60,17 +60,20 @@ jobs: GITHUB_TOKEN: ${{ github.token }} run: | python artifice/update_version_number.py ${{ github.ref_name }} piranhaGUI + - name: set git config env: GITHUB_TOKEN: ${{ github.token }} run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" + - name: stage changed files env: GITHUB_TOKEN: ${{ github.token }} run: | git add * + - name: commit changes id: commit continue-on-error: true @@ -78,21 +81,41 @@ jobs: GITHUB_TOKEN: ${{ github.token }} run: | git commit -m"incrementing version number" + - name: set git config env: GITHUB_TOKEN: ${{ github.token }} run: | git fetch origin main + - name: push changes to main env: GITHUB_TOKEN: ${{ github.token }} if: steps.commit.outcome == 'success' run: | git push origin HEAD:main -# - name: build deb package -# working-directory: ./artifice/linux_build/ -# run: | -# source create_piranha_package + + - name: pull piranha docker image + run: | + docker pull polionanopore/piranha:latest + + - name: save piranha docker image to file + working-directory: ./artifice/resources/ + run: | + docker save --output piranha.tar polionanopore/piranha:latest + + - name: Temporarily save piranha docker image + uses: actions/upload-artifact@v4 + with: + name: piranha.tar + path: artifice/resources/piranha.tar + retention-days: 1 + + - name: build deb package + working-directory: ./artifice/linux_build/ + run: | + source create_piranha_package + - name: release uses: actions/create-release@v1 id: create_release @@ -104,18 +127,17 @@ jobs: body_path: '' env: GITHUB_TOKEN: ${{ github.token }} -# - name: upload ubuntu/debian package -# uses: actions/upload-release-asset@v1 -# env: -# GITHUB_TOKEN: ${{ github.token }} -# with: -# upload_url: ${{ steps.create_release.outputs.upload_url }} -# asset_path: artifice/linux_build/pkg_file/${{ env.APPLICATION_NAME }}_${{ github.ref_name }}.deb -# asset_name: ${{ env.APPLICATION_NAME }}_${{ github.ref_name }}.deb -# asset_content_type: application/vnd.debian.binary-package - - + - name: upload ubuntu/debian package + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: artifice/linux_build/pkg_file/${{ env.APPLICATION_NAME }}_${{ github.ref_name }}.deb + asset_name: ${{ env.APPLICATION_NAME }}_${{ github.ref_name }}.deb + asset_content_type: application/vnd.debian.binary-package + build_darwin_release: needs: [build_deb_release] runs-on: macos-latest @@ -133,14 +155,23 @@ jobs: channels: conda-forge,defaults miniforge-version: latest auto-activate-base: false + + - name: Retrieve saved piranha docker image + uses: actions/download-artifact@v4 + with: + name: piranha.tar + path: artifice/resources/ + - name: build package working-directory: ./artifice/mac_build/pyinstaller_build/ run: | pyinstaller piranhaGUI.spec + - name: zip file working-directory: ./artifice/mac_build/pyinstaller_build/dist/ run: | zip -r ${{ env.APPLICATION_NAME }}v${{ github.ref_name }}.zip ${{ env.APPLICATION_NAME }}v${{ github.ref_name }}.app + - name: upload windows installer uses: actions/upload-release-asset@v1 env: @@ -151,37 +182,46 @@ jobs: asset_name: ${{ env.APPLICATION_NAME }}v${{ github.ref_name }}.zip asset_content_type: application/zip -# build_win_release: -# needs: [build_deb_release] -# runs-on: windows-latest -# env: -# RELEASE_URL: ${{ needs.build_deb_release.outputs.release_url }} -# -# steps: -# - uses: actions/checkout@v4 -# -# - uses: conda-incubator/setup-miniconda@v3 -# with: -# auto-update-conda: false -# environment-file: artifice/environment.yml -# activate-environment: artifice -# channels: conda-forge,defaults -# miniforge-version: latest -# auto-activate-base: false -# - name: build package -# working-directory: ./artifice/windows_build/ -# run: | -# ./build_windows.bat -# - name: compile installer -# uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 -# with: -# path: ./artifice/windows_build/dist/piranhaGUI_installer.iss -# - name: upload windows installer -# uses: actions/upload-release-asset@v1 -# env: -# GITHUB_TOKEN: ${{ github.token }} -# with: -# upload_url: ${{ env.RELEASE_URL }} -# asset_path: artifice/windows_build/dist/installer/${{ env.APPLICATION_NAME }}v${{ github.ref_name }}_installer_windows.exe -# asset_name: ${{ env.APPLICATION_NAME }}v${{ github.ref_name }}_installer_windows.exe -# asset_content_type: application/vnd.microsoft.portable-executable + build_win_release: + needs: [build_deb_release] + runs-on: windows-latest + env: + RELEASE_URL: ${{ needs.build_deb_release.outputs.release_url }} + + steps: + - uses: actions/checkout@v4 + + - uses: conda-incubator/setup-miniconda@v3 + with: + auto-update-conda: false + environment-file: artifice/environment.yml + activate-environment: artifice + channels: conda-forge,defaults + miniforge-version: latest + auto-activate-base: false + + - name: Retrieve saved piranha docker image + uses: actions/download-artifact@v4 + with: + name: piranha.tar + path: artifice/resources/ + + - name: build package + working-directory: ./artifice/windows_build/ + run: | + ./build_windows.bat + + - name: compile installer + uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 + with: + path: ./artifice/windows_build/dist/piranhaGUI_installer.iss + + - name: upload windows installer + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ env.RELEASE_URL }} + asset_path: artifice/windows_build/dist/installer/${{ env.APPLICATION_NAME }}v${{ github.ref_name }}_installer_windows.exe + asset_name: ${{ env.APPLICATION_NAME }}v${{ github.ref_name }}_installer_windows.exe + asset_content_type: application/vnd.microsoft.portable-executable