yeah using a separate job for that was a little silly, wasn't it?
This commit is contained in:
parent
21dd0796b7
commit
fac941d9b8
|
@ -14,60 +14,35 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
name: Check out sources
|
name: Check out sources
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
|
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev \
|
sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev \
|
||||||
qt6-{base,base-private,multimedia}-dev libslirp0 libslirp-dev libarchive-dev libzstd-dev --allow-downgrades
|
qt6-{base,base-private,multimedia}-dev libslirp0 libslirp-dev libarchive-dev libzstd-dev libfuse2
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: cmake -B build -G Ninja -DUSE_QT6=ON -DCMAKE_INSTALL_PREFIX=./dist
|
run: cmake -B build -G Ninja -DUSE_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
cmake --build build
|
cmake --build build
|
||||||
cmake --install build
|
DESTDIR=AppDir cmake --install build
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: melonDS-ubuntu-x86_64
|
name: melonDS-ubuntu-x86_64
|
||||||
path: dist
|
path: AppDir/usr/bin/melonDS
|
||||||
|
- name: Fetch AppImage tools
|
||||||
appimage:
|
run: |
|
||||||
name: AppImage
|
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
||||||
runs-on: ubuntu-22.04
|
wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
|
||||||
needs: [ build ]
|
chmod a+x linuxdeploy-*.AppImage
|
||||||
continue-on-error: true
|
- name: Build the AppImage
|
||||||
|
env:
|
||||||
steps:
|
QMAKE: /usr/lib/qt6/bin/qmake
|
||||||
- name: Install dependencies
|
run: |
|
||||||
run: |
|
./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt --output appimage
|
||||||
sudo apt update
|
- uses: actions/upload-artifact@v4
|
||||||
sudo apt install --allow-downgrades \
|
with:
|
||||||
qt6-{base,base-private,multimedia,tools}-dev qt6-qpa-plugins \
|
name: melonDS-appimage-x86_64
|
||||||
libpcap0.8 libsdl2-2.0-0 libslirp0 libarchive13 zstd libfuse2
|
path: melonDS*.AppImage
|
||||||
- name: Download build artifact
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: melonDS-ubuntu-x86_64
|
|
||||||
path: melonDS
|
|
||||||
- name: Prepare AppDir
|
|
||||||
run: |
|
|
||||||
mkdir AppDir
|
|
||||||
mv melonDS AppDir/usr
|
|
||||||
- name: Prepare necessary Tools for building the AppImage
|
|
||||||
run: |
|
|
||||||
ls -R
|
|
||||||
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
|
||||||
wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
|
|
||||||
chmod a+x linuxdeploy-x86_64.AppImage
|
|
||||||
chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
|
|
||||||
- name: Build the AppImage
|
|
||||||
env:
|
|
||||||
QMAKE: /usr/lib/qt6/bin/qmake
|
|
||||||
run: |
|
|
||||||
./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt --output appimage
|
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: melonDS-appimage-x86_64
|
|
||||||
path: melonDS*.AppImage
|
|
||||||
|
|
Loading…
Reference in New Issue