Bah

1 files changed, 26 insertions, 35 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4523551..9b4e574 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,8 @@
-# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
-
 stages:
   - build
-  - deploy
 
-win32:
-  image: fedora:35 #ubuntu:bionic
+"win32":
+  image: fedora:35
   stage: build
   script:
     - dnf install git autoconf automake mingw32-gcc python2 # mingw32-configure
@@ -24,36 +21,30 @@ win32:
     paths:
       - "freedroid/build_mingw32/build"
 
-appimage:
-    image: ubuntu:bionic
-    stage: build
-    script:
-        - apt install -y git autoconf automake pkg-config autopoint gcc python2 libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libjpeg-dev libpng-dev libsdl-ttf2.0-dev libvorbis-dev libogg-dev libzstd-dev zlib1g-dev libopengl-dev libgl-dev libglew-dev
-        - git clone https://gitlab.com/freedroid/freedroid-src.git freedroid
-        - ls
-        - chmod +x linuxdeploy-x86_64.AppImage
-        - chmod +x AppRun
-        - ./linuxdeploy-x86_64.AppImage --appimage-extract
-        - cd freedroid
-        - ./autogen.sh
-        - dir=`pwd`
-        - ./configure --datadir=$dir/run/share/games --bindir=$dir/run/bin --mandir=$dir/run/share/man 
-        - make -s
-        - make install
-        - cd ..
-        - mkdir AppDir
-        - cp -r $dir/run/share/games/freedroid/data AppDir/data
-        - cp ../../AppRun AppDir/AppRun
-        - ./squashfs-root/AppRun --appdir AppDir -i freedroid/pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg -d freedroid/pkgs/freedesktop/freedroidrpg.desktop -e freedroid/run/bin/freedroid --output appimage
-        - mkdir public
-        - ls
-        - mv *.AppImage public
+"appimage":
+  image: ubuntu:bionic
+  stage: build
+  script:
+    - apt install -y git autoconf automake pkg-config autopoint gcc python2 libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libjpeg-dev libpng-dev libsdl-ttf2.0-dev libvorbis-dev libogg-dev libzstd-dev zlib1g-dev libopengl-dev libgl-dev libglew-dev
+    - git clone https://gitlab.com/freedroid/freedroid-src.git freedroid
+    - ls
+    - chmod +x linuxdeploy-x86_64.AppImage
+    - chmod +x AppRun
+    - ./linuxdeploy-x86_64.AppImage --appimage-extract
+    - cd freedroid
+    - ./autogen.sh
+    - dir=`pwd`
+    - ./configure --datadir=$dir/run/share/games --bindir=$dir/run/bin --mandir=$dir/run/share/man 
+    - make -s
+    - make install
+    - cd ..
+    - mkdir AppDir
+    - cp -r $dir/run/share/games/freedroid/data AppDir/data
+    - cp ../../AppRun AppDir/AppRun
+    - ./squashfs-root/AppRun --appdir AppDir -i freedroid/pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg -d freedroid/pkgs/freedesktop/freedroidrpg.desktop -e freedroid/run/bin/freedroid --output appimage
+    - mkdir public
+    - ls
+    - mv *.AppImage public
   artifacts:
     paths:
       - "public/"
-
-deploy-job:
-  stage: deploy
-  script:
-    - echo "Deploying application..."
-    - echo "Application successfully deployed."