From 28e7e84529536c56823fa3ec47b71c967df831f2 Mon Sep 17 00:00:00 2001 From: Nayla Hanegan Date: Thu, 10 Oct 2024 07:43:14 -0400 Subject: [PATCH] lets try this --- .github/workflows/build.yml | 28 --------------- .github/workflows/ci.yml | 69 +------------------------------------ 2 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 33c64cbf3a..0000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Combined CI - -on: - push: - pull_request: - -jobs: - build_flatpak: - runs-on: ubuntu-latest - container: bilelmoussaoui/flatpak-github-actions:gnome-44 - - steps: - - uses: actions/checkout@v2 - - - name: Setup Packages - run: | - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install org.kde.Sdk//5.15 org.kde.Platform//5.15 -y - sudo dnf install libusb1-devel cmake git gcc-c++ libXext-devel libgudev qt6-qtbase-devel systemd-devel openal-soft-devel libevdev-devel libao-devel SOIL-devel libXrandr-devel pulseaudio-libs-devel bluez-libs-devel p7zip SDL2-devel -y - - - name: Build - run: flatpak-builder --user --install --force-clean build-dir Distribution/flatpak.yml - - - name: Upload Build Artifact - uses: actions/upload-artifact@v4 - with: - name: DolphinMPN-flatpak - path: build-dir \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 564d9a0500..33c64cbf3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,71 +25,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: DolphinMPN-flatpak - path: Distribution/OUT/ - - build_appimage: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Setup Submodules - run: git submodule update --init --recursive - - - name: Setup Packages - run: sudo apt install desktop-file-utils git cmake ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libevdev-dev libusb-1.0-0-dev libxrandr-dev libxi-dev libpangocairo-1.0-0 qt6-base-private-dev libqt6svg6-dev libbluetooth-dev libasound2-dev libpulse-dev libgl1-mesa-dev libcurl4-openssl-dev - - - name: Build - run: | - mkdir -p build && cd build && cmake .. -G Ninja -DLINUX_LOCAL_DEV=true -DCMAKE_INSTALL_PREFIX=/usr -DDISTRIBUTOR="Mario Party Netplay" && ninja -j8 - - - name: Upload Build Artifact - uses: actions/upload-artifact@v4 - with: - name: DolphinMPN-AppImage - path: root/ - - build_macos: - runs-on: macos-13 - - steps: - - uses: actions/checkout@v2 - - - name: Setup Submodules - run: git submodule update --init --recursive - - - name: Setup Packages - run: brew install qt6 molten-vk p7zip pkgconfig cmake ninja - - - name: Build - run: | - mkdir -p build && cd build && cmake .. -G Ninja -DCMAKE_CXX_FLAGS="-Xclang -fcolor-diagnostics" -DCMAKE_PREFIX_PATH=$(brew --prefix qt6) -DDISTRIBUTOR="Mario Party Netplay" && ninja -j8 - - - name: Upload Build Artifact - uses: actions/upload-artifact@v4 - with: - name: DolphinMPN-macOS - path: build/Binaries/ - - build_windows: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Setup Submodules - run: git submodule update --init --recursive - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - with: - vs-version: '16.6.2' - - - name: Build - run: msbuild "D:\a\Dolphin-MPN\Dolphin-MPN\Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release /property:Platform=x64 - - - name: Upload Build Artifact - uses: actions/upload-artifact@v4 - with: - name: DolphinMPN-win32 - path: Binary/x64/ \ No newline at end of file + path: build-dir \ No newline at end of file