Compare commits

...

63 Commits

Author SHA1 Message Date
a8054fa129 release v0.0.1-beta.0 2018-01-11 11:39:28 +01:00
e180bedcdf Update README how to use bump 2018-01-11 11:38:44 +01:00
598a52e41b release v0.0.2 2018-01-11 11:27:22 +01:00
33ba66538b release v0.0.1 2018-01-11 11:26:58 +01:00
fdffe15f5b AV: test different token 2018-01-11 10:48:21 +01:00
5f4b5ac7c5 AV: turn off crlf 2018-01-11 10:37:50 +01:00
06642c7d45 AV: update GH_TOKEN 2018-01-11 10:22:44 +01:00
b10d4f2dd5 Updated README how to release 2018-01-11 10:15:36 +01:00
0687c536af AV: GH_TOKEN 2018-01-11 10:03:47 +01:00
4abab7a96c CCI: build on tag and branches 2018-01-11 09:58:36 +01:00
1a3c538e68 CCI: build on tag 2018-01-11 09:56:22 +01:00
e6f5574b72 Test releases 2018-01-10 16:53:19 +01:00
35c0944d04 Release test 2018-01-10 16:39:44 +01:00
3056b0fbaf Travis: init 2018-01-10 16:08:17 +01:00
5b7bbe4f64 Compression level to normal 2018-01-10 15:53:33 +01:00
a037d97fbf Electronjs packages: limit files, ref #31 2018-01-10 15:36:30 +01:00
57f3bfb5b9 CCI: Fix Nightly Path - simple mistake 2018-01-10 14:53:53 +01:00
1d6466731a CCI: Fix Nightly Path 2018-01-10 14:49:40 +01:00
33b943138f CCI: deploy on SF - SCP 2018-01-10 14:39:18 +01:00
e706769c41 CCI: SF, AV: path 2018-01-10 14:29:26 +01:00
c510033de5 AV: push 2018-01-10 14:20:01 +01:00
8f095cbf51 AV: change var 2018-01-10 14:06:15 +01:00
73071d462a AV: fix var 2018-01-10 13:49:16 +01:00
498afb2632 AV: var as out dir 2018-01-10 13:35:33 +01:00
542be33c22 CCI: Yarn and AV: path 2018-01-10 13:27:25 +01:00
471c5f5774 CCI: Yarn and AV: path 2018-01-10 13:22:21 +01:00
e2ef2e30bc CCI: Yarn and AV: path 2018-01-10 13:18:17 +01:00
1d83d0a1f2 CCI: custom yarn - bash reload 2018-01-10 11:59:16 +01:00
0677618bb5 CCI: custom yarn - bash reload 2018-01-10 11:57:16 +01:00
206bdc7dc6 CCI: custom yarn - bash reload 2018-01-10 11:54:16 +01:00
c0919334bd CCI: custom yarn 2018-01-10 11:52:37 +01:00
0014fc7a62 AV: artifact with directory 2018-01-10 11:47:30 +01:00
a4057f1a04 CCI: brew yarn 2018-01-10 11:42:25 +01:00
2afc54051d AV: push path 2018-01-10 11:36:58 +01:00
6e6a2a4d6f CCI: net. conc 1 2018-01-10 11:33:27 +01:00
6064892be5 AV: Push Artifacts 2018-01-10 11:29:32 +01:00
f64479d755 CCI: Yarn clear cache 2018-01-10 11:27:32 +01:00
f5b3ff1787 CCI: Fix Yarn 2018-01-10 11:17:17 +01:00
b69bef7654 CCI: clean install 2018-01-10 10:57:04 +01:00
c96dcb1dbe AV: artifacts path; CCI: check yarn network conc. 1 2018-01-10 10:47:46 +01:00
f18f9deb34 AV: artifacts path 2018-01-10 10:44:15 +01:00
12ad880fa1 CCI: upgrade yarn 2018-01-10 10:33:33 +01:00
a96b83b481 CCI: brew is already installed 2018-01-10 10:30:24 +01:00
51af56f867 CCI: use XCode 9.1.0 image 2018-01-10 10:28:51 +01:00
90b478a969 Init CCI and fix artifacts paths on AV 2018-01-10 10:22:19 +01:00
8a9d4d5fe1 AF: publish only exe 2018-01-10 09:45:33 +01:00
a61989612c AV: Upload to Nightly Builds 2018-01-09 16:46:42 +01:00
a2c23d225d PS vars 2018-01-09 16:33:27 +01:00
3fe275cf6c Deploy on SF: only in PS 2018-01-09 16:18:19 +01:00
2efd541875 Deploy on SF: fix path 2018-01-09 16:06:30 +01:00
1c09c7b71c Deploy on SF: fix path 2018-01-09 16:00:08 +01:00
cd6b12dd60 Deploy on SF: fix path 2018-01-09 15:50:07 +01:00
be1378fcb2 Deploy on SF 2018-01-09 15:45:48 +01:00
9425d0edef EB: don't publish on github 2018-01-09 14:19:47 +01:00
09bacaefc6 Update app description 2018-01-09 14:19:04 +01:00
55cfdbca96 Build using asar 2018-01-09 13:51:29 +01:00
36253113d7 Remove option from electron-builder.yml 2018-01-09 13:43:26 +01:00
aebfa517bf Move config for electron-builder outside package.json 2018-01-09 13:39:37 +01:00
b513202339 AV: define artifacts path 2018-01-09 11:39:10 +01:00
7f059c7807 Copy all files during build 2018-01-09 11:11:17 +01:00
665e01f110 Integrate with AppVeyor 2018-01-09 11:01:20 +01:00
029ab352d2 AppId and proper categories for macOS and linux 2018-01-09 10:38:37 +01:00
1cc54e8520 Icons set 2018-01-04 12:50:20 +01:00
19 changed files with 220 additions and 10 deletions

47
.appveyor.yml Normal file
View File

@ -0,0 +1,47 @@
version: 1.0.{build}
# Do not build feature branch with open Pull Requests
skip_branch_with_pr: true
platform:
- x64
#init:
# - git config --global core.autocrlf input
install:
- ps: Install-Product node 8 x64
- yarn
build_script:
- yarn distwin
- ps: $OutputDirectory = $((Get-Date).ToString('yyyy-MM-dd'))
- ps: If ($env:APPVEYOR_REPO_TAG -eq $false) { New-Item -ItemType Directory -Path "$OutputDirectory" }
- ps: If ($env:APPVEYOR_REPO_TAG -eq $false) { move build\*.exe "$OutputDirectory" }
- ps: If ($env:APPVEYOR_REPO_TAG -eq $false) { cd $OutputDirectory; Get-ChildItem -Filter '*.exe' | Rename-Item -NewName {$_.Name -replace ".exe","-$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_BUILD_NUMBER.exe"} }
- ps: If ($env:APPVEYOR_REPO_TAG -eq $false) { $execs = Get-ChildItem -Filter '*.exe'; $artifact = $execs[0].basename; }
- ps: If ($env:APPVEYOR_REPO_TAG -eq $false) { cd ..; Push-AppveyorArtifact "$((Get-Date).ToString('yyyy-MM-dd'))\*.exe" -FileName "$((Get-Date).ToString('yyyy-MM-dd'))\$artifact.exe" }
# - ps: If ($env:APPVEYOR_REPO_TAG -eq $true) { yarn release }
test: off
#artifacts:
# - path: '$(OutputDirectory)\*.exe'
deploy:
- provider: FTP
protocol: sftp
host: frs.sourceforge.net
username: gns3build
password:
secure: YRiLLoY27UOZ8QJHqqdESBQFfPfENKV0cLI/QFSsbWc=
folder: "../../../../frs/project/gns-3/Nightly Builds"
artifact: /.*\.exe/
on:
appveyor_repo_tag: false # deploy on branch only
environment:
GH_TOKEN:
secure: EgwJ4mP2sPsfurW//aPDUXW+O7R+3N0pSfr+Y3SpiKK+70tGVbqy93pWCcdrPf45

67
.circleci/config.yml Normal file
View File

@ -0,0 +1,67 @@
# iOS CircleCI 2.0 configuration file
version: 2
jobs:
build:
macos:
xcode: "9.1.0"
steps:
- checkout
- run:
name: Set timezone and check current datetime
command: |
sudo systemsetup -settimezone Europe/Warsaw
echo "Today is $(date +"%Y-%m-%d %T")"
- run:
name: Install project
# there is an issue with yarn and cache during executed on CI; for now we just run it twice, second should
# be successful. Check it later if updates fixed the issue
command: |
yarn || true
yarn || true
- run:
name: Dist project
command: |
yarn distmac
- run:
name: Gather artifacts
command: |
mkdir artifacts
cp build/*.dmg artifacts/
- store_artifacts:
path: artifacts
destination: artifacts
- deploy:
name: Deploying on SourceForge
command: |
echo "Deploying on SourceForge"
ssh-keyscan -H frs.sourceforge.net >> ~/.ssh/known_hosts
mkdir -p artifacts/release
cd artifacts; for file in *.dmg; do mv "$file" "release/${file%.dmg}-${CIRCLE_BRANCH}-${CIRCLE_BUILD_NUM}.dmg"; done; cd ..
echo "mkdir \"/home/frs/project/gns-3/Nightly Builds/$(date +"%Y-%m-%d")\"" | sftp gns3build@frs.sourceforge.net || true
echo "Copying to SourceForge"
scp artifacts/release/* gns3build@frs.sourceforge.net:"/home/frs/project/gns-3/Nightly\ Builds/$(date +"%Y-%m-%d")/"
#
# release:
# macos:
# xcode: "9.1.0"
#
# steps:
# - yarn release
#
workflows:
version: 2
build_and_deploy:
jobs:
- build:
filters:
tags:
only: /v.*/

1
.gitignore vendored
View File

@ -34,6 +34,7 @@
npm-debug.log
testem.log
/typings
/yarn-error.log
# e2e
/e2e/*.js

View File

@ -22,6 +22,7 @@ before_script:
script: ng test --watch=false
after_script:
# publish on gns3.github.io
- ng build --base-href /${TRAVIS_BRANCH}/
- export GIT_LAST_LOG="$(git log -1 --pretty=%B)"
- git clone https://${GITHUB_CREDENTIALS}@github.com/GNS3/gns3.github.io.git github-pages
@ -34,3 +35,6 @@ after_script:
- git commit -m "Deploy - $GIT_LAST_LOG"
- git push origin master
# publish
- yarn
- yarn distlinux

View File

@ -50,6 +50,47 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.
# Releasing
## Bumping releases
We're using [version-bump-prompt](https://www.npmjs.com/package/version-bump-prompt) for increasing version.
Intall `bump` via:
npm install -g version-bump-prompt
If you would like to bump prepatch just type:
bump --prepatch --tag --push
## Final release
We have got configured CircleCI, TravisCI and AppVeyor for distributing application for particular platform. In order to release you need to tag your code nad push it.
Using `bump`:
bump --patch --tag --push
Or manually:
git tag v0.0.1
git push origin v0.0.1
When artifacts are made you can see draft release here: [gns3-web-ui releases](https://github.com/GNS3/gns3-web-ui/releases) which is waiting to be published.
After release please change current version in `package.json` to `X.X.X-beta.0`'. Otherwise artifacts will be overwritten during the next commit.
You may use `bump` to achieve that:
bump --prepatch
## Staging release
In case you would like to create a new staging release. Please create draft release on github, like `0.0.1-dev1`. After successful build you can find there artifacts.
## Further help
If you want to contribute to GNS3 Web UI feel free to reach us at `developers@gns3.net`.

51
electron-builder.yml Normal file
View File

@ -0,0 +1,51 @@
appId: com.gns3.web-ui
copyright: "Copyright © 2018 GNS3"
productName: "GNS3 Web UI Prototype"
#forceCodeSigning: true
artifactName: "${productName}-${os}-${arch}-${version}.${ext}"
asar: true
compression: normal
directories:
output: build
files:
- dist
- main.js
- package.json
mac:
category: public.app-category.developer-tools
# publish: github
target:
- dmg
dmg:
# background: "build/appdmg.png"
icon: "dist/assets/icons/mac/icon.icns"
iconSize: 128
contents:
- x: 380
y: 240
type: link
path: /Applications
- x: 122
y: 240
type: file
linux:
# publish: github
icon: "dist/assets/icons/png"
category: "Network"
packageCategory: "Network"
description: "GNS3 Web Ui Prototype application. Please don't use it as long as it's not officially announced."
target:
- deb
- AppImage
maintainer: "Dominik Ziajka <dominik@gns3.net>"
win:
# publish: github
icon: "dist/assets/icons/win/icon.ico"
nsis:
perMachine: true

View File

@ -9,7 +9,7 @@ const url = require('url');
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
let mainWindow
let mainWindow;
function createWindow () {
// Create the browser window.

View File

@ -1,22 +1,21 @@
{
"name": "gns3-web-ui",
"version": "0.0.0",
"license": "MIT",
"version": "0.0.1-beta.0",
"license": "GPLv3",
"main": "main.js",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"buildforelectron": "ng build -e electronProd",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"electrondev": "concurrently -k \"ng serve -e electronDev\" \"electron .\"",
"distlinux": "ng build -e electronProd && electron-builder --linux"
},
"build": {
"directories": {
"output": "build"
}
"distlinux": "yarn buildforelectron && electron-builder --linux --x64",
"distwin": "yarn buildforelectron && electron-builder --win --x64",
"distmac": "yarn buildforelectron && electron-builder --mac --x64",
"release": "build"
},
"private": true,
"dependencies": {
@ -67,4 +66,4 @@
"popper.js": "^1.12.3",
"jquery": "1.9.1 - 3"
}
}
}

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 KiB