Skip to content

Commit cccb2da

Browse files
committed
Updated workflows
- Update Ubuntu-runner to latest - Changed how firefox is set up in integration.yml
1 parent c9a2fc3 commit cccb2da

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/data-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
updateData:
1212
name: Update data - ${{ matrix.fetch }}
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
if: ${{ github.repository_owner == 'searx'}}
1515
strategy:
1616
matrix:

.github/workflows/integration.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,26 @@ permissions:
1212
jobs:
1313
python:
1414
name: Python ${{ matrix.python-version }}
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
os: [ubuntu-20.04]
18+
os: [ubuntu-latest]
1919
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v2
2323
- name: Install Ubuntu packages
2424
run: |
2525
sudo ./utils/searx.sh install packages
26-
sudo apt install firefox
26+
# Use APT Firefox rather than Snap
27+
sudo add-apt-repository -y ppa:mozillateam/ppa
28+
echo '
29+
Package: *
30+
Pin: release o=LP-PPA-mozillateam
31+
Pin-Priority: 1001
32+
' | sudo tee /etc/apt/preferences.d/mozilla-firefox
33+
sudo apt-get update
34+
sudo apt-get install -y firefox
2735
- name: Set up Python
2836
uses: actions/setup-python@v2
2937
with:
@@ -53,7 +61,7 @@ jobs:
5361

5462
themes:
5563
name: Themes
56-
runs-on: ubuntu-20.04
64+
runs-on: ubuntu-latest
5765
steps:
5866
- name: Checkout
5967
uses: actions/checkout@v2
@@ -69,7 +77,7 @@ jobs:
6977
uses: actions/cache@v4
7078
with:
7179
path: ./local
72-
key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
80+
key: python-ubuntu-latest-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
7381
- name: Install node dependencies
7482
run: make V=1 node.env
7583
- name: Build themes
@@ -79,7 +87,7 @@ jobs:
7987
permissions:
8088
contents: write # for JamesIves/github-pages-deploy-action to push changes in repo
8189
name: Documentation
82-
runs-on: ubuntu-20.04
90+
runs-on: ubuntu-latest
8391
steps:
8492
- name: Checkout
8593
uses: actions/checkout@v2
@@ -98,7 +106,7 @@ jobs:
98106
uses: actions/cache@v4
99107
with:
100108
path: ./local
101-
key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
109+
key: python-ubuntu-latest-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
102110
- name: Build documentation
103111
run: |
104112
make V=1 docs.clean docs.html
@@ -120,7 +128,7 @@ jobs:
120128
- documentation
121129
env:
122130
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
123-
runs-on: ubuntu-20.04
131+
runs-on: ubuntu-latest
124132
steps:
125133
- name: Checkout
126134
if: env.DOCKERHUB_USERNAME != null
@@ -138,7 +146,7 @@ jobs:
138146
uses: actions/cache@v4
139147
with:
140148
path: ./local
141-
key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
149+
key: python-ubuntu-latest-3.9-${{ hashFiles('requirements*.txt', 'setup.py') }}
142150
- name: Set up QEMU
143151
if: env.DOCKERHUB_USERNAME != null
144152
uses: docker/setup-qemu-action@v1

0 commit comments

Comments
 (0)