diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..57f8428c --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,39 @@ +name: Node.js CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-16.04 + + strategy: + matrix: + node-version: [8.x, 10.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: sudo apt update + - run: sudo apt install -y libjansson-dev libboost-dev imagemagick libtinyxml-dev git cmake build-essential wget libgazebo7-dev + - run: sudo npm install -g grunt + # - run: sudo bash -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/chrome.list' + # - run: sudo wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + # - run: sudo apt update + # - run: sudo apt install -y xvfb google-chrome-stable gnustep-base-runtime + # - run: sudo wget -q -O /usr/bin/xvfb-chrome https://gist.githubusercontent.com/chapulina/a80bd83d3494c96dc9eead843579c435/raw/7d304595d401c1265b533626d542ace7e6916002/xvfb-chrome + # - run: sudo ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome + # - run: sudo chmod 755 /usr/bin/google-chrome + # - run: defaults write com.google.chrome HardwareAccelerationModeEnabled -integer 1 + # - run: export DISPLAY=:0 + - run: npm run deploy + # - run: npm test + # - run: npm run coverage + - run: npm run update + - run: npm run docs + env: + CI: true + diff --git a/README.md b/README.md index ae34fe6c..18ff69a1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Gzweb is a WebGL client for [Gazebo](http://gazebosim.org). Like gzclient, it's http://gazebosim.org/gzweb -[![codecov](https://codecov.io/bb/osrf/gzweb/branch/master/graph/badge.svg)](https://codecov.io/bb/osrf/gzweb) +[![codecov](https://codecov.io/gh/osrf/gzweb/branch/master/graph/badge.svg)](https://codecov.io/gh/osrf/gzweb) # Installation diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml deleted file mode 100644 index 9d3fca89..00000000 --- a/bitbucket-pipelines.yml +++ /dev/null @@ -1,32 +0,0 @@ -image: gazebo:libgazebo8 - -pipelines: - default: - - step: - script: - - apt update - # Dependencies - - apt install -y libjansson-dev libboost-dev imagemagick libtinyxml-dev mercurial cmake build-essential wget nodejs npm nodejs-legacy - - npm install -g grunt - # Chrome - - echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list - - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - - set -x && apt update && apt install -y xvfb google-chrome-stable - - wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome - - ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome - - chmod 755 /usr/bin/google-chrome - # Install - - npm run deploy - # Test - - npm test - - npm run coverage - # Try update script - - npm run update - # Check docs can be generated - - npm run docs - # Test gzbridge C++ code - - cd gzbridge - - mkdir build_test - - cd build_test - - cmake .. - - make && make test diff --git a/deploy.sh b/deploy.sh index c855a0e5..2b4905eb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -108,7 +108,7 @@ then if [[ -z $LOCAL ]] then echo -n "Downloading gazebo_models..." - hg clone https://bitbucket.org/osrf/gazebo_models -b default + git clone https://gitgub.com/osrf/gazebo_models -b master RETVAL=$? if [ $RETVAL -ne 0 ]; then diff --git a/gz3d/src/gzscene.js b/gz3d/src/gzscene.js index 9e1d9c4f..a0ca5dff 100644 --- a/gz3d/src/gzscene.js +++ b/gz3d/src/gzscene.js @@ -2673,7 +2673,7 @@ GZ3D.Scene.prototype.viewCOM = function(model) } }; -// TODO: Issue https://bitbucket.org/osrf/gzweb/issues/138 +// TODO: Issue https://github.com/osrf/gzweb/issues/138 /** * View inertia * Toggle: if there are inertia visuals, hide, otherwise, show. diff --git a/karma.conf.js b/karma.conf.js index 6afba295..1732356a 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -100,7 +100,7 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['Firefox'], // Continuous Integration mode diff --git a/package.json b/package.json index 6f02cb6a..bf553292 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "1.3.0", "description": "WebGL client for Gazebo", "repository": { - "type": "mercurial", - "url": "https://bitbucket.org/osrf/gzweb" + "type": "git", + "url": "git+https://github.com/osrf/gzweb.git" }, "config": { "port": "", @@ -43,8 +43,8 @@ "jasmine-jquery": "^2.1.1", "jsdoc": "^3.5.5", "karma": "^1.7.0", - "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.1", + "karma-firefox-launcher": "^1.3.0", "karma-htmlfile-reporter": "^0.3.5", "karma-jasmine": "^1.1.0", "taffydb": "^2.7.3",