Revert "Attempting to update apt and dpkg before installing other pac…

…kages" This reverts commit 355dd36.
SeleniumHQ · Sep 15, 2019 · b8e372d · b8e372d
1 parent 93e8407
commit b8e372d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -146,9 +146,6 @@ matrix:
       <<: *ruby
     - env: TASK=//rb:lint
       <<: *ruby
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y dpkg
 install: ./scripts/travis/install.sh
 before_script: ./scripts/travis/before_script.sh
 script: travis_wait 40 ./scripts/travis/script.sh

diff --git a/java/client/test/org/openqa/selenium/environment/BUILD.bazel b/java/client/test/org/openqa/selenium/environment/BUILD.bazel
@@ -17,7 +17,7 @@ java_library(
         "//common/src/web",
         "//javascript/atoms",
         "//third_party/closure/goog",
-        "//third_party/js/selenium:webdriver.json",
+        "//third_party/js/selenium:webdriver_json",
         "//third_party/js/selenium:webdriver_xpi",
         "//third_party/js/sizzle",
     ],

diff --git a/java/client/test/org/openqa/selenium/testing/StaticResources.java b/java/client/test/org/openqa/selenium/testing/StaticResources.java
@@ -45,12 +45,11 @@ static void ensureAvailable() {
     copy("javascript/webdriver/atoms/get-attribute.js",
          "org/openqa/selenium/remote/getAttribute.js");
 
-    bazel.build("//third_party/js/selenium:webdriver.json");
     // Firefox XPI
-    copy("third_party/js/selenium:webdriver.json",
+    copy("third_party/js/selenium/webdriver_prefs.json",
          "org/openqa/selenium/firefox/webdriver_prefs.json");
     bazel.build("third_party/js/selenium:webdriver_xpi");
-    copy("third_party/js/selenium:webdriver_xpi",
+    copy("third_party/js/selenium/webdriver.xpi",
         "org/openqa/selenium/firefox/xpi/webdriver.xpi");
   }
 

diff --git a/third_party/js/selenium/BUILD.bazel b/third_party/js/selenium/BUILD.bazel
@@ -12,8 +12,10 @@ copy_file(
     ],
 )
 
-exports_files(
-    ["webdriver.json"],
+copy_file(
+    name = "webdriver_json",
+    src = "webdriver.json",
+    out = "webdriver_prefs.json",
     visibility = [
         "//dotnet/src/webdriver:__pkg__",
         "//java/client/src/org/openqa/selenium/firefox:__pkg__",