From 11f372e5908ea3a32a4adb49272de54741096a32 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 00:27:21 +0200 Subject: [PATCH 1/6] trigger more packages --- .travis.yml | 23 +++++++++++++++++++---- package.json | 2 ++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a57638..d1d0a99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +dist: trusty +osx_image: xcode8 + language: node_js node_js: 6 @@ -5,15 +8,27 @@ cache: directories: - node_modules -os: - - osx - - linux +matrix: + include: + - os: osx + - os: linux + env: CC=clang CXX=clang++ npm_config_clang=1 + compiler: clang + +addons: + apt: + packages: + - icnsutils + - graphicsmagick + - xz-utils + - rpm + - bsdtar before_script: - npm prune script: - - npm run dist + - npm run dist --ia32 --x64 notifications: slack: ramme:44ubE4BVf3FGi8OldEKL743J diff --git a/package.json b/package.json index 945dc1a..64a8037 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,8 @@ "linux": { "target": [ "deb", + "rpm", + "pacman", "AppImage" ] } From 14bdda3ec3d436e18062a309e49ece5b2ad6dd98 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 00:46:52 +0200 Subject: [PATCH 2/6] add snap packages, add more information for linux package --- .travis.yml | 3 +++ package.json | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1d0a99..f965e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: required dist: trusty osx_image: xcode8 @@ -23,6 +24,8 @@ addons: - xz-utils - rpm - bsdtar + - gcc-multilib + - g++-multilib before_script: - npm prune diff --git a/package.json b/package.json index 64a8037..6fc3773 100644 --- a/package.json +++ b/package.json @@ -17,14 +17,26 @@ "category": "public.app-category.social-networking" }, "linux": { + "synopsis": "Unofficial Instagram Desktop App", + "category": "Internet", + "packageCategory": "Network;", + "depdends": [ + "libappindicator1", + "libindicator7" + ], "target": [ "deb", "rpm", "pacman", - "AppImage" + "AppImage", + "snap" ] } }, + "snap": { + "confinement": "devmode", + "grade": "stable" + }, "devDependencies": { "babel-preset-babili": "^0.1.2", "babel-preset-es2015": "^6.24.1", From 92e9f9e0be57c6bd6afaa03e0bc57fd93b83df5d Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 00:55:56 +0200 Subject: [PATCH 3/6] remove dep --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 6fc3773..66dd33f 100644 --- a/package.json +++ b/package.json @@ -20,14 +20,11 @@ "synopsis": "Unofficial Instagram Desktop App", "category": "Internet", "packageCategory": "Network;", - "depdends": [ - "libappindicator1", - "libindicator7" - ], "target": [ "deb", "rpm", "pacman", + "tar.gz", "AppImage", "snap" ] From 274834422f524a620598d732a2738682db7d3bfb Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 01:04:20 +0200 Subject: [PATCH 4/6] add snapcraft for building snap packages --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f965e53..c189952 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ addons: - xz-utils - rpm - bsdtar + - snapcraft - gcc-multilib - g++-multilib From c13b8205d5c66031a845f2ffdfc5eafaa97c4688 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 01:23:22 +0200 Subject: [PATCH 5/6] attempt to fix snap builds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c189952..c51b8cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ sudo: required -dist: trusty osx_image: xcode8 language: node_js From 6f46356a6e8e491e6594093b8a7feb018a6bb105 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 27 May 2017 01:33:50 +0200 Subject: [PATCH 6/6] remove snap support, snapcraft not available on trusty --- .travis.yml | 2 +- package.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c51b8cd..bb638c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty sudo: required osx_image: xcode8 @@ -23,7 +24,6 @@ addons: - xz-utils - rpm - bsdtar - - snapcraft - gcc-multilib - g++-multilib diff --git a/package.json b/package.json index 66dd33f..f3d6975 100644 --- a/package.json +++ b/package.json @@ -25,15 +25,10 @@ "rpm", "pacman", "tar.gz", - "AppImage", - "snap" + "AppImage" ] } }, - "snap": { - "confinement": "devmode", - "grade": "stable" - }, "devDependencies": { "babel-preset-babili": "^0.1.2", "babel-preset-es2015": "^6.24.1",