Fix benchmark job

.circleci/config.yml

@@ -19,21 +19,29 @@ jobs:
             # Set up the Debian testing repo, and then install g++ from there...
             sudo bash -c "echo \"deb http://ftp.us.debian.org/debian testing main contrib non-free\" >> /etc/apt/sources.list"
             sudo apt-get update
-            sudo apt-get install node-less cmake build-essential clang-format-6.0 flake8 uglifyjs python3-yaml chromium ccache
+            sudo apt-get install node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache
             sudo apt-get install -t testing g++-8
             sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6
             sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 80 --slave /usr/bin/g++ g++ /usr/bin/g++-8
             sudo update-alternatives --set gcc /usr/bin/gcc-8
             sudo ln -s /usr/bin/clang-format-6.0 /usr/bin/clang-format
 
-            sudo pip install virtualenv
+            # Get recent version of Firefox and geckodriver
+            wget -O firefox.tar.bz2 https://download.mozilla.org/\?product\=firefox-latest-ssl\&os\=linux64\&lang\=en-US
+            tar jxf firefox.tar.bz2
+            wget https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz
+            tar zxf geckodriver-v0.21.0-linux64.tar.gz -C firefox
 
-            virtualenv pyodide-env
+            # Get recent version of chromedriver
+            wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip
+            unzip chromedriver_linux64.zip
+            mv chromedriver pyodide-env/bin/
 
+            # Install Python dependencies
+            sudo pip install virtualenv
+            virtualenv pyodide-env
             source pyodide-env/bin/activate
-
-            pip install pytest pytest-xdist pytest-instafail selenium PyYAML
-
+            pip install pytest pytest-xdist pytest-instafail selenium PyYAML flake8
 
       - run:
           name: lint
@@ -69,6 +77,8 @@ jobs:
           paths:
             - ./build
             - ./pyodide-env
+            - ./cpython/build/3.7.0/host
+            - ./firefox
 
       - store_artifacts:
           path: /home/circleci/repo/build/
@@ -86,12 +96,6 @@ jobs:
             # causes Firefox to complain when loading it.  Let's just add the new mime type.
             sudo bash -c "echo 'application/wasm wasm' >> /etc/mime.types"
 
-            # Get recent version of Firefox and geckodriver
-            wget -O firefox.tar.bz2 https://download.mozilla.org/\?product\=firefox-latest-ssl\&os\=linux64\&lang\=en-US
-            tar jxf firefox.tar.bz2
-            wget https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz
-            tar zxf geckodriver-v0.21.0-linux64.tar.gz -C firefox
-
             source pyodide-env/bin/activate
             export PATH=$PWD/firefox:$PATH
             pytest test -v -k firefox
@@ -109,11 +113,6 @@ jobs:
             # causes Firefox to complain when loading it.  Let's just add the new mime type.
             sudo bash -c "echo 'application/wasm wasm' >> /etc/mime.types"
 
-            # Get recent version of chromedriver
-            wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip
-            unzip chromedriver_linux64.zip
-            mv chromedriver pyodide-env/bin/
-
             source pyodide-env/bin/activate
             pytest test -v -k chrome
 
@@ -128,21 +127,12 @@ jobs:
           command: |
             sudo bash -c "echo 'application/wasm wasm' >> /etc/mime.types"
 
-            # Get recent version of Firefox and geckodriver
-            wget -O firefox.tar.bz2 https://download.mozilla.org/\?product\=firefox-latest-ssl\&os\=linux64\&lang\=en-US
-            tar jxf firefox.tar.bz2
-            wget https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz
-            tar zxf geckodriver-v0.21.0-linux64.tar.gz -C firefox
-
-            # Get recent version of chromedriver
-            wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip
-            unzip chromedriver_linux64.zip
-            mv chromedriver pyodide-env/bin/
-
             source pyodide-env/bin/activate
             export PATH=$PWD/firefox:$PATH
             python benchmark/benchmark.py cpython/build/3.7.0/host/bin/python3 build/benchmarks.json
             python benchmark/plot_benchmark.py build/benchmarks.json build/benchmarks.png
+      - store_artifacts:
+          path: /home/circleci/repo/build
 
   deploy:
     machine: