From 2a88ae29941122c1da3054ad8ec6f4a746a21581 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 16 Apr 2018 22:15:40 -0700 Subject: [PATCH 1/5] CI against release ver of ptvsd, allow failure of master ver of ptvsd --- .appveyor.yml | 17 +++++++++++++++++ .travis.yml | 31 +++++++++++++++++++++++++------ gulpfile.js | 2 ++ package.json | 1 + 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8be46ea0344b..20ed4b79ed06 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,6 +9,12 @@ environment: nodejs_version: "8.9.1" APPVEYOR: "true" DEBUGGER_TEST: "true" + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.3" + PYTHON_ARCH: "32" + nodejs_version: "8.9.1" + APPVEYOR: "true" + DEBUGGER_TEST_RELEASE: "true" - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.3" PYTHON_ARCH: "32" @@ -27,6 +33,13 @@ environment: nodejs_version: "8.9.1" APPVEYOR: "true" ANALYSIS_TEST: "true" + allow_failures: + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.3" + PYTHON_ARCH: "32" + nodejs_version: "8.9.1" + APPVEYOR: "true" + DEBUGGER_TEST_RELEASE: "true" init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" @@ -58,6 +71,10 @@ test_script: - yarn run vscode:prepublish - if [%DEBUGGER_TEST%]==[true] ( yarn run testDebugger --silent) + - yarn run clean:ptvsd + - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre + - if [%DEBUGGER_TEST_RELEASE%]==[true] ( + yarn run testDebugger --silent) - if [%SINGLE_WORKSPACE_TEST%]==[true] ( yarn run testSingleWorkspace --silent) - if [%MULTIROOT_WORKSPACE_TEST%]==[true] ( diff --git a/.travis.yml b/.travis.yml index 99ec74c36292..7c204bd16be1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ matrix: - os: linux python: "2.7" env: DEBUGGER_TEST=true + - os: linux + python: "2.7" + env: DEBUGGER_TEST_RELEASE=true - os: linux python: "2.7" env: SINGLE_WORKSPACE_TEST=true @@ -15,12 +18,22 @@ matrix: - os: linux python: "3.6-dev" env: DEBUGGER_TEST=true + - os: linux + python: "3.6-dev" + env: DEBUGGER_TEST_RELEASE=true - os: linux python: "3.6-dev" env: SINGLE_WORKSPACE_TEST=true - os: linux python: "3.6-dev" env: MULTIROOT_WORKSPACE_TEST=true + allow_failures: + - os: linux + python: "2.7" + env: DEBUGGER_TEST=true + - os: linux + python: "3.6-dev" + env: DEBUGGER_TEST=true before_install: | if [ $TRAVIS_OS_NAME == "linux" ]; then export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0; @@ -51,12 +64,18 @@ script: - if [ $TRAVIS_UPLOAD_COVERAGE == "true" ]; then bash <(curl -s https://codecov.io/bash); fi - # - rm -rf ./pythonFiles/experimental/ptvsd - # - pip install -t ./pythonFiles/experimental/ptvsd ptvsd - # - yarn run testDebugger --silent - # - if [ $TRAVIS_UPLOAD_COVERAGE == "true" ]; then - # bash <(curl -s https://codecov.io/bash); - # fi + - yarn run clean:ptvsd + - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre; + - if [ $DEBUGGER_TEST_RELEASE == "true" ]; then + yarn run clean; + yarn run vscode:prepublish; + yarn run cover:enable; + yarn run testDebugger --silent; + fi + - yarn run debugger-coverage + - if [ $TRAVIS_UPLOAD_COVERAGE == "true" ]; then + bash <(curl -s https://codecov.io/bash); + fi - if [ $SINGLE_WORKSPACE_TEST == "true" ]; then yarn run clean; yarn run vscode:prepublish; diff --git a/gulpfile.js b/gulpfile.js index ba89b0a92e2f..753af8c46292 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -95,6 +95,8 @@ gulp.task('output:clean', () => del(['coverage', 'debug_coverage*'])); gulp.task('cover:clean', () => del(['coverage', 'debug_coverage*'])); +gulp.task('clean:ptvsd', () => del(['coverage', 'pythonFiles/experimental/ptvsd*'])); + gulp.task('cover:enable', () => { return gulp.src("./coverconfig.json") .pipe(jeditor((json) => { diff --git a/package.json b/package.json index 906ad9e94b14..546445b45674 100644 --- a/package.json +++ b/package.json @@ -1849,6 +1849,7 @@ "lint-staged": "node gulpfile.js", "lint": "tslint src/**/*.ts -t verbose", "clean": "gulp clean", + "clean:ptvsd": "gulp clean:ptvsd", "cover:enable": "gulp cover:enable", "debugger-coverage": "gulp debugger-coverage" }, From 927d001df34de97fdcb4f39617ae4c60e1da13ad Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 16 Apr 2018 22:20:17 -0700 Subject: [PATCH 2/5] :memo: add news entry --- news/3 Code Health/1253.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/3 Code Health/1253.md diff --git a/news/3 Code Health/1253.md b/news/3 Code Health/1253.md new file mode 100644 index 000000000000..5dcc6d79bfec --- /dev/null +++ b/news/3 Code Health/1253.md @@ -0,0 +1 @@ +Run CI tests against the release version and master branch of PTVSD (experimental debugger), allowing tests to fail against the mastre branch of PTVSD. From 4800b07b9c9179e453f64de653369932e1589d91 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 16 Apr 2018 22:34:59 -0700 Subject: [PATCH 3/5] appveyor fixes --- .appveyor.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 20ed4b79ed06..2fdcaaa3d6ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -33,13 +33,14 @@ environment: nodejs_version: "8.9.1" APPVEYOR: "true" ANALYSIS_TEST: "true" - allow_failures: - - PYTHON: "C:\\Python36" - PYTHON_VERSION: "3.6.3" - PYTHON_ARCH: "32" - nodejs_version: "8.9.1" - APPVEYOR: "true" - DEBUGGER_TEST_RELEASE: "true" + +allow_failures: + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.3" + PYTHON_ARCH: "32" + nodejs_version: "8.9.1" + APPVEYOR: "true" + DEBUGGER_TEST_RELEASE: "true" init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" From 4a11336896ae274229b0b77f2eb6d59bbfa0ead3 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 16 Apr 2018 22:36:21 -0700 Subject: [PATCH 4/5] allow failures --- .appveyor.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2fdcaaa3d6ea..359c066d831b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,13 +34,14 @@ environment: APPVEYOR: "true" ANALYSIS_TEST: "true" -allow_failures: - - PYTHON: "C:\\Python36" - PYTHON_VERSION: "3.6.3" - PYTHON_ARCH: "32" - nodejs_version: "8.9.1" - APPVEYOR: "true" - DEBUGGER_TEST_RELEASE: "true" +matrix: + allow_failures: + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.3" + PYTHON_ARCH: "32" + nodejs_version: "8.9.1" + APPVEYOR: "true" + DEBUGGER_TEST_RELEASE: "true" init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" From aa8e698b18cb44b09326dac7e5bf62123d582488 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Fri, 20 Apr 2018 09:32:22 -0700 Subject: [PATCH 5/5] Ensure cached versions are not used --- .appveyor.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 359c066d831b..dbea6e3a5494 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -74,7 +74,7 @@ test_script: - if [%DEBUGGER_TEST%]==[true] ( yarn run testDebugger --silent) - yarn run clean:ptvsd - - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre + - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre --no-cache-dir - if [%DEBUGGER_TEST_RELEASE%]==[true] ( yarn run testDebugger --silent) - if [%SINGLE_WORKSPACE_TEST%]==[true] ( diff --git a/.travis.yml b/.travis.yml index 7c204bd16be1..52ae4e0b99f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ script: bash <(curl -s https://codecov.io/bash); fi - yarn run clean:ptvsd - - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre; + - pip install -t ./pythonFiles/experimental/ptvsd ptvsd --pre --no-cache-dir; - if [ $DEBUGGER_TEST_RELEASE == "true" ]; then yarn run clean; yarn run vscode:prepublish;