diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index 73f8d61..29d40e5 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - 'snap/**' + - "snap/**" workflow_dispatch: env: @@ -38,5 +38,7 @@ jobs: run: | pip install requests export M64P_LINUX_URL=$(python3 ../scripts/get_linux_asset.py ${{ env.VERSION }}) + sed -i 's/M64PVERSION/${{ env.VERSION }}/g' snap/snapcraft.yaml + sed -i 's/M64PURL/$M64P_LINUX_URL/g' snap/snapcraft.yaml snapcraft --enable-experimental-extensions snapcraft upload --release=stable *.snap diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml index aff5a3c..3aad951 100644 --- a/.github/workflows/toolbox.yml +++ b/.github/workflows/toolbox.yml @@ -37,6 +37,7 @@ jobs: run: | pip install requests export M64P_LINUX_URL=$(python3 ../scripts/get_linux_asset.py ${{ env.VERSION }}) + sed -i 's/M64PURL/$M64P_LINUX_URL/g' Containerfile podman build . --tag quay.io/loganmc10/m64p:latest --tag quay.io/loganmc10/m64p:${{ env.VERSION }} podman push quay.io/loganmc10/m64p:latest podman push quay.io/loganmc10/m64p:${{ env.VERSION }} diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4156a5f..519945a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: m64p base: core20 -version: $VERSION +version: M64PVERSION compression: lzo summary: An easy to use N64 emulator. Available for Windows and Linux description: | @@ -56,5 +56,5 @@ parts: override-prime: | snapcraftctl prime cp -f $SNAPCRAFT_STAGE/usr/lib/p7zip/7za $SNAPCRAFT_STAGE/usr/bin/7za - source: $M64P_LINUX_URL + source: M64PURL plugin: dump diff --git a/toolbox/Containerfile b/toolbox/Containerfile index 4b7e8ed..9dce36e 100644 --- a/toolbox/Containerfile +++ b/toolbox/Containerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora-toolbox:35 -RUN wget -q ${M64P_LINUX_URL} -O /m64p.zip && unzip /m64p.zip && rm /m64p.zip && \ +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 && \