Skip to content

Commit

Permalink
Updates for GitHub (osrf#177)
Browse files Browse the repository at this point in the history
* Updates for GitHub

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* install deps

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* don't install node again

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* update image

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* update image

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* update image

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* remove node 12.x

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* install chrome

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* sudo all the things

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* move sudo

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* sudo-do-do-do-do

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* try --disable-gpu

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* enable HardwareAccelerationModeEnabled

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* skip tests and coverage for now

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Try firefox just in case

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* no display?

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* give up

Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina authored Jun 4, 2020
1 parent 45df9d5 commit 0a18472
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 39 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
32 changes: 0 additions & 32 deletions bitbucket-pipelines.yml

This file was deleted.

2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gz3d/src/gzscene.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 0a18472

Please sign in to comment.