diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efb172e..d3a9933 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: - main paths-ignore: - "snap/**" - - "toolbox/**" pull_request: jobs: diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml deleted file mode 100644 index 571e3b0..0000000 --- a/.github/workflows/toolbox.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Upload toolbox container - -on: - release: - workflow_dispatch: - -env: - REGISTRY_USER: loganmc10 - IMAGE_REGISTRY: quay.io - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - PYTHON_VERSION: "3.9" - -jobs: - build-toolbox: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: ${{ env.PYTHON_VERSION }} - - - name: Log in to Quay.io - uses: redhat-actions/podman-login@v1 - with: - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} - registry: ${{ env.IMAGE_REGISTRY }} - - - name: Run podman - run: | - pip install requests - export M64P_VERSION=$(python3 ../scripts/get_release_version.py) - export M64P_LINUX_URL=$(python3 ../scripts/get_linux_asset.py $M64P_VERSION) - sed -i "s~M64PURL~$M64P_LINUX_URL~g" Containerfile - podman build . --tag quay.io/loganmc10/m64p:latest --tag quay.io/loganmc10/m64p:$M64P_VERSION - podman push quay.io/loganmc10/m64p:latest - podman push quay.io/loganmc10/m64p:$M64P_VERSION - working-directory: toolbox diff --git a/README.md b/README.md index a32c483..1e8f367 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,6 @@ **Downloads found here: https://github.com/m64p/m64p/releases** ___ * On Ubuntu, it can also be downloaded from the Snap Store: https://snapcraft.io/m64p -* If you're on Linux and don't want to use snap, you can also install using these instructions: https://github.com/m64p/m64p/tree/main/toolbox +* There is also a Flatpak: https://flathub.org/apps/details/io.github.m64p.m64p ___ See this page for how to enable the VRU and Raphnet Input plugin for the Snap package: https://github.com/m64p/m64p/wiki/Linux-Snap-package-advanced-usage diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 519945a..f38de8d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -46,7 +46,6 @@ parts: - libsdl2-2.0-0 - libsdl2-net-2.0-0 - libhidapi-hidraw0 - - libminizip1 - p7zip-full - libatomic1 - libglu1-mesa diff --git a/toolbox/Containerfile b/toolbox/Containerfile deleted file mode 100644 index 9dce36e..0000000 --- a/toolbox/Containerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM registry.fedoraproject.org/fedora-toolbox:35 - -RUN wget -q M64PURL -O /m64p.zip && unzip /m64p.zip && rm /m64p.zip && \ - ln -s /mupen64plus/mupen64plus-gui /usr/bin/start -RUN dnf -y update && dnf -y install qt5-qtbase-gui qt5-qtwebsockets SDL2_net minizip-compat hidapi libatomic pipewire-libs p7zip && dnf clean all -y -RUN ln -s /run/host/usr/share/vulkan/icd.d/nvidia_icd.json /usr/share/vulkan/icd.d/nvidia_icd.json && \ - ln -s /run/host/usr/lib64/libGLX_nvidia.so.0 /usr/lib64/libGLX_nvidia.so.0 -ENV M64P_DISABLE_UPDATER=1 diff --git a/toolbox/README.md b/toolbox/README.md deleted file mode 100644 index c1075d9..0000000 --- a/toolbox/README.md +++ /dev/null @@ -1,22 +0,0 @@ -On systems without Snap (like Fedora) you can use [toolbox](https://containertoolbx.org/) to easily install m64p. -## Prep -### Fedora -``` -sudo dnf -y install toolbox wget -``` -### Arch/Manjaro -``` -sudo pacman -S toolbox wget -``` -## Installation -``` -bash -x <(wget -qO- https://raw.githubusercontent.com/m64p/m64p/main/toolbox/install.sh) -``` -## Updating -To update, simply re-run the installation script -## Removal -``` -bash -x <(wget -qO- https://raw.githubusercontent.com/m64p/m64p/main/toolbox/remove.sh) -``` -## Launching -Search for "m64p" in your application menu and launch from there. diff --git a/toolbox/install.sh b/toolbox/install.sh deleted file mode 100755 index 967e7d6..0000000 --- a/toolbox/install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -podman stop m64p -toolbox rm m64p -y -podman pull quay.io/loganmc10/m64p:latest -toolbox create --image quay.io/loganmc10/m64p:latest m64p -y -toolbox run -c m64p echo UP -sleep 5 -podman image prune -a -f -mkdir -p ~/.local/share/icons -wget -q https://raw.githubusercontent.com/m64p/m64p/main/snap/gui/m64p.png -O ~/.local/share/icons/m64p.png -mkdir -p ~/.local/share/applications -wget -q https://raw.githubusercontent.com/m64p/m64p/main/toolbox/m64p.desktop -O ~/.local/share/applications/m64p.desktop -chmod +x ~/.local/share/applications/m64p.desktop diff --git a/toolbox/m64p.desktop b/toolbox/m64p.desktop deleted file mode 100755 index a7754e6..0000000 --- a/toolbox/m64p.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=m64p -GenericName=m64p -Type=Application -Comment=N64 Emulator -Icon=m64p.png -Terminal=false -StartupNotify=false -Keywords=n64;emulator; -Categories=Game;Emulator; -Exec=toolbox run -c m64p start diff --git a/toolbox/remove.sh b/toolbox/remove.sh deleted file mode 100755 index b705b6c..0000000 --- a/toolbox/remove.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -podman stop m64p -toolbox rm m64p -y -sleep 5 -podman image prune -a -f -rm -f ~/.local/share/icons/m64p.png -rm -f ~/.local/share/applications/m64p.desktop