Commit f1a41cb4 authored by Robin Eschbach's avatar Robin Eschbach
Browse files

[FIX #464] new dockerimage version

parent f35293c3
......@@ -12,7 +12,7 @@ create_directory_and_cmake___release:
key: "CacheRelease"
paths:
- build/release
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- ls
- mkdir -p build
......@@ -29,7 +29,7 @@ create_directory_and_cmake___debug:
key: "CacheDebug"
paths:
- build/debug
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- ls
- mkdir -p build
......@@ -46,7 +46,7 @@ stylecheck_job:
key: "CacheRelease"
paths:
- build/release
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- pwd
- cd build/release
......@@ -60,7 +60,7 @@ doc_job:
key: "CacheDebug"
paths:
- build/debug
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- doxygen --version
- pwd
......@@ -75,7 +75,7 @@ buildAndTest:
key: "CacheRelease"
paths:
- build/release
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- pwd
- cd build/release
......@@ -90,7 +90,7 @@ buildAndTestDebug:
key: "CacheDebug"
paths:
- build/debug
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- pwd
- cd build/debug
......@@ -101,24 +101,10 @@ buildAndTestDebug:
buildAppImage:
stage: Build_appimage_stage
cache:
key: "CacheRelease"
paths:
- build/release
image: appimagecrafters/appimage-builder:0.8.8
before_script:
- apt-get update
- apt-get install -y cmake
- mkdir -p tools/AppImage/AppImageBuild
- rm -rf tools/AppImage/AppImageBuild/AppDir
image: ladbukkit/openwalnut_build_environment:1.3
script:
- pwd
- cd build/release
- pwd
- ls
- make install DESTDIR=../../tools/AppImage/AppImageBuild/AppDir
- pwd
- cd ../../tools/AppImage
- cd tools/AppImage
- pwd
- ls
- chmod +x appimage.sh
......@@ -126,7 +112,7 @@ buildAppImage:
uploadArtifacts:
stage: Upload_artifacts_stage
image: ladbukkit/openwalnut_build_environment:1.2
image: ladbukkit/openwalnut_build_environment:1.3
script:
- pwd
- cd tools/upload
......
......@@ -63,21 +63,19 @@ Package()
echo "* Copy AppRun"
cp ../AppRun ./AppDir/AppRun
echo "* Download Packager"
wget -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
wget -N https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
chmod +x linuxdeploy*.AppImage
echo "* Downloading appimagetool"
wget https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
chmod +x appimagetool-x86_64.AppImage
echo "* Packaging"
export LD_LIBRARY_PATH="$(pwd)/AppDir/usr/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
ARCH=x86_64 ./linuxdeploy-x86_64.AppImage \
--appdir AppDir \
-d openwalnut.desktop \
-i ../../../artwork/Icons/openwalnut_128x128.png \
--plugin qt \
--output appimage
ARCH=x86_64 linuxdeploy \
--appdir AppDir \
-d openwalnut.desktop \
-i ../../../artwork/Icons/openwalnut_128x128.png \
--plugin qt
ARCH=x86_64 ./appimagetool-x86_64.AppImage --appimage-extract-and-run ./AppDir
cd ..
}
......@@ -119,4 +117,4 @@ case "$1" in
*)
UsageExit
;;
esac
esac
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment