From 0eca9a21845c5227208b442ea04b15272374f187 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 08:44:46 +0100 Subject: [PATCH 01/18] Set python and node version. --- appveyor.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5e36517..c03659a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,17 @@ +version: "{build}" + environment: - PYTHON: "3.6" - nodejs_version: "6" + PYTHON: "C:\\Python38-x64" + nodejs_version: "12" install: - npm install -test_script: - - npm run test - build_script: - npm run build +test_script: + - npm run test + artifacts: - path: build\package\* From 1552ddb8acb371d3501bcd60e6ec1e2da148532a Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 08:57:09 +0100 Subject: [PATCH 02/18] Add travis file. --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f1b90e7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: node_js + +node_js: + - 15 + +install: + - npm install + +script: + - npm run build + - npm run test From 22f328e9df232335c7d222abb73d9bd91d8aee2b Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:02:19 +0100 Subject: [PATCH 03/18] Print python version. --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1b90e7..2c0c19e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ install: - npm install script: - - npm run build + - python -V - npm run test diff --git a/appveyor.yml b/appveyor.yml index c03659a..d1da6f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ install: - npm install build_script: - - npm run build + - python -V test_script: - npm run test From 5966c6ad6497657d67a7d7885dba05b046ef01ba Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:04:44 +0100 Subject: [PATCH 04/18] Set python version on travis. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c0c19e..e2bfc2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,15 @@ language: node_js node_js: - - 15 + - "15" + +python: + - "3.9" install: - npm install script: - python -V + - npm run build - npm run test From fdf021114367d25584a6960bb2726fb827d99be9 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:15:33 +0100 Subject: [PATCH 05/18] Modify travis and appveyor files. --- .travis.yml | 5 +++-- appveyor.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2bfc2d..0b1b143 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: node_js +env: + - python + node_js: - "15" @@ -10,6 +13,4 @@ install: - npm install script: - - python -V - - npm run build - npm run test diff --git a/appveyor.yml b/appveyor.yml index d1da6f5..296bd1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ version: "{build}" environment: - PYTHON: "C:\\Python38-x64" - nodejs_version: "12" + - PYTHON: "C:\\Python38-x64" + - nodejs_version: "14" install: - npm install From 3fdbd88b3beeaefc00a2070294bbfc90d90ef10b Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:16:41 +0100 Subject: [PATCH 06/18] Modify appveyor environment. --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 296bd1d..bfa687f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,7 @@ version: "{build}" environment: - - PYTHON: "C:\\Python38-x64" - - nodejs_version: "14" + PYTHON: "C:\\Python38-x64" install: - npm install From 8a13aa57118f3f4cf6a3407c131678d181cfa772 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:22:25 +0100 Subject: [PATCH 07/18] Set node js version. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bfa687f..00d48b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ version: "{build}" environment: - PYTHON: "C:\\Python38-x64" + nodejs_version: "12" install: - npm install From 8912895f68d8a9f0970a57db2c605e2202c5c900 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:23:47 +0100 Subject: [PATCH 08/18] Install the preferred node js version. --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 00d48b7..a72358a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,10 @@ version: "{build}" environment: - nodejs_version: "12" + nodejs_version: "15" install: + - ps: Install-Product node $env:nodejs_version - npm install build_script: From a9b354e601357a9a522c6c7b389b9c5f9b1cf664 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:24:56 +0100 Subject: [PATCH 09/18] Set python version. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index a72358a..f9f73c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: "{build}" environment: nodejs_version: "15" + PYTHON: "C:\\Python38-x64" install: - ps: Install-Product node $env:nodejs_version From 68c7086b842e42bda4a3f104c772ea871ad896ce Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:26:33 +0100 Subject: [PATCH 10/18] Set python version. --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f9f73c2..e269da4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,10 +6,11 @@ environment: install: - ps: Install-Product node $env:nodejs_version + - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% - npm install build_script: - - python -V + - npm run build test_script: - npm run test From 444a4c1254af2bd292340804008594d7cfe0fc14 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:27:45 +0100 Subject: [PATCH 11/18] Minor modification. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e269da4..762db73 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,11 +2,11 @@ version: "{build}" environment: nodejs_version: "15" - PYTHON: "C:\\Python38-x64" + python_path: "C:\\Python38-x64" install: - ps: Install-Product node $env:nodejs_version - - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% + - set PATH=%python_path%;%python_path%\\Scripts;%python_path% - npm install build_script: From 736f59260cc9547ce47daf70d2b60a715d70197f Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:30:21 +0100 Subject: [PATCH 12/18] Add CI badges. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 98e56f9..9d6ad97 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ This repository contains the source code of the https://3dviewer.net website. The website can open several 3D file formats and visualize the model in your browser. +[![Build status](https://ci.appveyor.com/api/projects/status/exypq43a8kjby5n0?svg=true)](https://ci.appveyor.com/project/kovacsv/online3dviewer) +[![Build Status](https://travis-ci.com/kovacsv/Online3DViewer.svg?branch=master)](https://travis-ci.com/kovacsv/Online3DViewer) + ## Supported file formats ### Import From c5baa13920d671cdb3b753dfb0c187b45300e2b4 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:34:07 +0100 Subject: [PATCH 13/18] Fix appveyor.yml. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 762db73..dc779af 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: install: - ps: Install-Product node $env:nodejs_version - - set PATH=%python_path%;%python_path%\\Scripts;%python_path% + - set PATH=%python_path%;%python_path%\\Scripts;%PATH% - npm install build_script: From 05c29201fcbbf7387dc213b83860e2693e03c4eb Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:40:32 +0100 Subject: [PATCH 14/18] Try to use python 3. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b1b143..f312fed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,12 @@ env: node_js: - "15" - -python: - - "3.9" install: + - alias python=python3 - npm install script: - npm run test + - python -V + - npm run build From 4c049d3f7553baef731ffe1268cd4fc5a343ba9e Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:41:59 +0100 Subject: [PATCH 15/18] Another try. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f312fed..b15366d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,10 @@ node_js: - "15" install: - - alias python=python3 - npm install script: - npm run test + - alias python=python3 - python -V - npm run build From 13d8a3a6dcb736317eb22308be413466a6269792 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 09:43:33 +0100 Subject: [PATCH 16/18] Remove build on travis. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b15366d..ceb907c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,3 @@ install: script: - npm run test - - alias python=python3 - - python -V - - npm run build From 57253d6455860db458e3c3880c05223283f54162 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 10:03:08 +0100 Subject: [PATCH 17/18] Publish artifacts on release. --- appveyor.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index dc779af..d7c9c6d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,3 +17,13 @@ test_script: artifacts: - path: build\package\* + +deploy: + description: 'News:\n- ...' + provider: GitHub + auth_token: + secure: oN14X2NG9+1O6cVQ7m2pIUkMxJ4mbZC1oht03WtJPS4E03MfPH8wZYAw9vmkSL9H + draft: true + on: + branch: master + APPVEYOR_REPO_TAG: true From e8c9b695c48fe6df4645ae4b81381bc628a2f5e5 Mon Sep 17 00:00:00 2001 From: Viktor Kovacs Date: Sat, 27 Mar 2021 10:10:15 +0100 Subject: [PATCH 18/18] Minor modifications. --- website/index.html | 1 + website/o3dv/website.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index 738c6bd..57696b5 100644 --- a/website/index.html +++ b/website/index.html @@ -140,6 +140,7 @@
Example models:
logo + | solids
diff --git a/website/o3dv/website.css b/website/o3dv/website.css index 5cc992a..9238ccf 100644 --- a/website/o3dv/website.css +++ b/website/o3dv/website.css @@ -666,7 +666,7 @@ div.ov_progress } -@media only screen and (max-height: 600px) +@media only screen and (max-height: 700px) { .only_full_height