From befd1362aa352ed1d9ca2807c2e85c2b0f8cfc74 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 19 Jul 2024 12:03:35 +0200 Subject: [PATCH] [upd] upgrade: github actions / to ubuntu: 24.04 / to nvm: node 20.15 - actions/setup-python@v4 --> actions/setup-python@v5 - actions/cache@v3 --> actions/cache@v4 - ubuntu-20.04 --> ubuntu-24.04 - nvm: node 20.10 --> node 20.15 Signed-off-by: Markus Heiser --- .github/workflows/checker.yml | 2 +- .github/workflows/integration.yml | 40 +++++++++++------------ .github/workflows/security.yml | 2 +- .github/workflows/translations-update.yml | 6 ++-- .nvmrc | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/checker.yml b/.github/workflows/checker.yml index 241b74538..11c7579e1 100644 --- a/.github/workflows/checker.yml +++ b/.github/workflows/checker.yml @@ -7,7 +7,7 @@ on: jobs: checker: name: Checker - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c6e74eaef..ec5e2a6ed 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -12,10 +12,10 @@ permissions: jobs: python: name: Python ${{ matrix.python-version }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-24.04] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Checkout @@ -25,13 +25,13 @@ jobs: sudo ./utils/searxng.sh install packages sudo apt install firefox - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: 'x64' - name: Cache Python dependencies id: cache-python - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./local @@ -56,26 +56,26 @@ jobs: themes: name: Themes - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 - name: Install Ubuntu packages run: sudo ./utils/searxng.sh install buildhost - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' - name: Cache Python dependencies id: cache-python - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-ubuntu-24.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - name: Install node dependencies run: make V=1 node.env - name: Build themes @@ -83,7 +83,7 @@ jobs: documentation: name: Documentation - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo steps: @@ -95,19 +95,19 @@ jobs: - name: Install Ubuntu packages run: sudo ./utils/searxng.sh install buildhost - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' - name: Cache Python dependencies id: cache-python - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-ubuntu-24.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - name: Build documentation run: | make V=1 docs.clean docs.html @@ -124,7 +124,7 @@ jobs: babel: name: Update translations branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 if: ${{ github.repository_owner == 'searxng' && github.ref == 'refs/heads/master' }} needs: - python @@ -139,19 +139,19 @@ jobs: fetch-depth: '0' token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' - name: Cache Python dependencies id: cache-python - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-ubuntu-24.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - name: weblate & git setup env: WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} @@ -174,7 +174,7 @@ jobs: - documentation env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout if: env.DOCKERHUB_USERNAME != null @@ -183,19 +183,19 @@ jobs: # make sure "make docker.push" can get the git history fetch-depth: '0' - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' - name: Cache Python dependencies id: cache-python - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-ubuntu-24.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - name: Set up QEMU if: env.DOCKERHUB_USERNAME != null uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index e1a8e99e5..b9d4900b4 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -7,7 +7,7 @@ on: jobs: dockers: name: Trivy ${{ matrix.image }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/translations-update.yml b/.github/workflows/translations-update.yml index 6c1c24562..e79812819 100644 --- a/.github/workflows/translations-update.yml +++ b/.github/workflows/translations-update.yml @@ -7,7 +7,7 @@ on: jobs: babel: name: "create PR for additions from weblate" - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 if: ${{ github.repository_owner == 'searxng' && github.ref == 'refs/heads/master' }} steps: - name: Checkout @@ -16,7 +16,7 @@ jobs: fetch-depth: '0' token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' architecture: 'x64' @@ -28,7 +28,7 @@ jobs: ./local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-ubuntu-24.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - name: weblate & git setup env: WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} diff --git a/.nvmrc b/.nvmrc index 0fdd238b4..6bef68bd9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.10 \ No newline at end of file +v20.15 \ No newline at end of file