diff options
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db552d4b..698ea326 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,7 @@ jobs: run: | make dist env: - BUILD: linux + BUILD: linux-old INKSTITCH_GPG_KEY: ${{ secrets.INKSTITCH_GPG_KEY }} - uses: actions/upload-artifact@v4 with: @@ -119,9 +119,6 @@ jobs: # for sigining sudo apt install rpm - # for GUI - sudo apt install python-wxgtk3.0-dev wxpython-tools - uname -a python --version python -m pip --version @@ -130,6 +127,8 @@ jobs: python -m pip install pycairo python -m pip install PyGObject + python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxPython-4.2.2-cp312-cp312-linux_x86_64.whl + python -m pip install -r requirements.txt # for networkx python -m pip install pandas @@ -150,7 +149,7 @@ jobs: run: | make dist env: - BUILD: linux + BUILD: linux-new INKSTITCH_GPG_KEY: ${{ secrets.INKSTITCH_GPG_KEY }} - uses: actions/upload-artifact@v4 with: @@ -248,7 +247,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: inkstitch-linux32 - path: artifacts + path: artifacts windows32: runs-on: windows-2019 steps: @@ -518,7 +517,7 @@ jobs: release: runs-on: ubuntu-latest - needs: [linux32, linux, windows32, windows64, macx86, macarm64] + needs: [linux32, linux64-old, linux64-new, windows32, windows64, macx86, macarm64] if: always() steps: - name: determine release info @@ -536,10 +535,15 @@ jobs: echo "prerelease=true" >> $GITHUB_ENV echo "title=development build of $branch" >> $GITHUB_ENV fi - - name: download linux + - name: download linux64-old + uses: actions/download-artifact@v4 + with: + name: 'inkstitch-linux64-old' + path: 'artifacts/' + - name: download linux64-new uses: actions/download-artifact@v4 with: - name: 'inkstitch-linux' + name: 'inkstitch-linux64-new' path: 'artifacts/' - name: download linux32 uses: actions/download-artifact@v4 |