Update github workflow files.

mozilla · Feb 18, 2025 · 411dbf1 · 411dbf1
1 parent a359068
commit 411dbf1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/linux_manual.yml b/.github/workflows/linux_manual.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup firefox
         id: setup-firefox
-        uses: ./.github/actions/setup_firefox/
+        uses: browser-actions/setup-firefox@v1
         with:
           firefox-version: ${{ matrix.firefox }}
       - run: |
@@ -50,11 +50,12 @@ jobs:
       - name: Setup tests
         shell: bash
         run: ./setup_script.sh
+      - name: Create SSL Certificate Files
+        run: |
+            openssl req -x509 -newkey rsa:2048 -keyout search_files/server.key -out search_files/server.cert -days 365 -nodes -subj "/CN=localhost"
       - name: Run Tests
-        run: tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="/opt/hostedtoolcache/firefox/${{ matrix.firefox }}/x64/firefox" ${{ inputs.extra-arguments }}
-        env:
-            SSL_CERT: ${{ secrets.SSL_CERT }}
-            SSL_KEY: ${{ secrets.SSL_KEY }}
+        run: |
+          tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="/opt/hostedtoolcache/firefox/${{ matrix.firefox }}/x64/firefox" ${{ inputs.extra-arguments }}
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:

diff --git a/.github/workflows/windows_manual.yml b/.github/workflows/windows_manual.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup firefox
         id: setup-firefox
-        uses: ./.github/actions/setup_firefox/
+        uses: browser-actions/setup-firefox@v1
         with:
           firefox-version: ${{ matrix.firefox }}
       - run: |
@@ -68,11 +68,12 @@ jobs:
       - name: Setup tests
         shell: bash
         run: ./setup_script.sh
+      - name: Create SSL Certificate Files (Windows)
+        shell: bash
+        run: |
+          openssl req -x509 -newkey rsa:2048 -keyout search_files/server.key -out search_files/server.cert -days 365 -nodes -subj "/CN=localhost"
       - name: Run Tests
         run: tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="C:\Program Files\Firefox_${{ matrix.firefox }}\firefox.exe" ${{ inputs.extra-arguments }}
-        env:
-            SSL_CERT: ${{ secrets.SSL_CERT }}
-            SSL_KEY: ${{ secrets.SSL_KEY }}
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:

diff --git a/search_server/search_server.py b/search_server/search_server.py
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from http.server import HTTPServer, SimpleHTTPRequestHandler
-import os
 import ssl