Commit 6a887339 authored by akiraohgaki's avatar akiraohgaki

Merge branch 'develop'

parents 717ea63f 5ddf9f15
Pipeline #34 passed with stage
in 6 minutes and 52 seconds
stages:
- build
appimage:
stage: build
image: ubuntu:14.04
only:
- master
- /^release\-.+/
script:
- ./scripts/package ci_appimage
- cat transfer.log
......@@ -57,7 +57,8 @@ $(TARGET)-linux-x64: ocs-manager
ocs-manager:
$(MKDIR) $(build_tmpdir)
git clone https://www.opencode.net/OCS/ocs-manager.git -b release-0.6.5 --single-branch --depth=1 $(build_tmpdir)/ocs-manager
#git clone https://www.opencode.net/OCS/ocs-manager.git -b release-0.6.5 --single-branch --depth=1 $(build_tmpdir)/ocs-manager
git clone https://github.com/opendesktop/ocs-manager.git -b release-0.6.5 --single-branch --depth=1 $(build_tmpdir)/ocs-manager
cd $(build_tmpdir)/ocs-manager ; \
./scripts/package build_appimage
$(INSTALL_PROGRAM) `find "$(build_tmpdir)/ocs-manager" -type f -name "ocs-manager*-x86_64.AppImage"` $(srcdir)/bin/ocs-manager
......@@ -5,4 +5,4 @@ Icon=ocs-store
Type=Application
Terminal=false
NoDisplay=false
Categories=Network;Utility;
Categories=Network;Settings;
......@@ -18,7 +18,7 @@
"scripts": {
"start": "electron .",
"debug": "electron . --debug",
"package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.travis\\.yml|Makefile|README\\.md|release\\.json|desktop|launcher|pkg|scripts|appimagebuild|appimagetool|squashfs\\-root|build_.+)($|/)'"
"package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.travis\\.yml|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|release\\.json|desktop|launcher|pkg|scripts|appimagebuild|appimagetool|squashfs\\-root|build_.+)($|/)'"
},
"dependencies": {
"electron-store": "2.0.0",
......
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