Merge pull request #7297 from mokibit/remove-angularjs-workaround

Remove workaround for fixing AngularJS build failures

.bbtravis.yml

@@ -127,21 +127,18 @@ script:
   - title: frontend build tests
     condition: TESTS == "js_build" and TRAVIS_PULL_REQUEST
     cmd: |
-      export NODE_OPTIONS=--openssl-legacy-provider
       export PATH=/tmp/bbvenv/bin/:$PATH
       make frontend
 
   - title: full frontend tests
     condition: TESTS == "js_build" and not TRAVIS_PULL_REQUEST
     cmd: |
-      export NODE_OPTIONS=--openssl-legacy-provider
       export PATH=/tmp/bbvenv/bin/:$PATH
       make frontend_install_tests
 
   - title: frontend unit tests
     condition: TESTS == "js_unit"
     cmd: |
-      export NODE_OPTIONS=--openssl-legacy-provider
       export PATH=/tmp/bbvenv/bin/:$PATH
       make frontend_tests
 
@@ -201,7 +198,6 @@ script:
   - title: maketarballs
     condition: TESTS in ("e2e_react_whl", "e2e_react_tgz")
     cmd:  |
-      export NODE_OPTIONS=--openssl-legacy-provider
       export PATH=/tmp/bbvenv/bin/:$PATH
       make tarballs
 

.circleci/config.yml

@@ -40,10 +40,10 @@ jobs:
           command: |
             . .venv/bin/activate
             make docs-release
-            NODE_OPTIONS=--openssl-legacy-provider make tarballs
+            make tarballs
             # Note that installing www/react-base depends on frontend_deps target being built, which is
             # a dependency of the tarballs target.
-            NODE_OPTIONS=--openssl-legacy-provider pip install -e www/react-base
+            pip install -e www/react-base
             pyinstaller pyinstaller/buildbot-worker.spec
             # we test the new generated binary with the global virtualenv
             SANDBOXED_WORKER_PATH=`pwd`/dist/buildbot-worker trial --reporter=text --rterrors buildbot.test.integration.interop