From e55e936e43da33718281631b28f923f75c5b5c10 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 9 Mar 2024 15:19:30 +0100 Subject: [PATCH 1/2] [mod] lint github YAML config files Signed-off-by: Markus Heiser --- manage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage b/manage index 7edcb1f5a..d19458c72 100755 --- a/manage +++ b/manage @@ -57,7 +57,7 @@ while IFS= read -r line; do if [ "$line" != "tests/unit/settings/syntaxerror_settings.yml" ]; then YAMLLINT_FILES+=("$line") fi -done <<< "$(git ls-files './tests/*.yml' './searx/*.yml' './utils/templates/etc/searxng/*.yml')" +done <<< "$(git ls-files './tests/*.yml' './searx/*.yml' './utils/templates/etc/searxng/*.yml' '.github/*.yml' '.github/*/*.yml')" RST_FILES=( 'README.rst' From ef163e3b01f880872b61941dfbcf0b44c4f9110a Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 1 Nov 2024 11:32:48 +0100 Subject: [PATCH 2/2] [fix] issues reported by `make test.yamllint` Signed-off-by: Markus Heiser --- .github/workflows/checker.yml | 2 +- .github/workflows/data-update.yml | 2 +- .github/workflows/integration.yml | 232 +++++++++++----------- .github/workflows/security.yml | 2 +- .github/workflows/translations-update.yml | 96 ++++----- 5 files changed, 167 insertions(+), 167 deletions(-) diff --git a/.github/workflows/checker.yml b/.github/workflows/checker.yml index 241b74538..707433b67 100644 --- a/.github/workflows/checker.yml +++ b/.github/workflows/checker.yml @@ -1,5 +1,5 @@ name: "Checker" -on: +on: # yamllint disable-line rule:truthy schedule: - cron: "0 4 * * 5" workflow_dispatch: diff --git a/.github/workflows/data-update.yml b/.github/workflows/data-update.yml index ee3576eee..39893127d 100644 --- a/.github/workflows/data-update.yml +++ b/.github/workflows/data-update.yml @@ -1,5 +1,5 @@ name: "Update searx.data" -on: +on: # yamllint disable-line rule:truthy schedule: - cron: "59 23 28 * *" workflow_dispatch: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c1c529ef7..59cabdc4a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,6 +1,6 @@ name: Integration -on: +on: # yamllint disable-line rule:truthy push: branches: ["master"] pull_request: @@ -16,62 +16,62 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ["3.9", "3.10", "3.11", "3.12",] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Install Ubuntu packages - run: | - sudo ./utils/searxng.sh install packages - sudo apt install firefox - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - architecture: 'x64' - - name: Cache Python dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: | - ./local - ./.nvm - ./node_modules - key: python-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements*.txt', 'setup.py') }} - - name: Install Python dependencies - if: steps.cache-python.outputs.cache-hit != 'true' - run: | - make V=1 install - make V=1 gecko.driver - - name: Run tests - run: make V=1 ci.test + - name: Checkout + uses: actions/checkout@v4 + - name: Install Ubuntu packages + run: | + sudo ./utils/searxng.sh install packages + sudo apt install firefox + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + architecture: 'x64' + - name: Cache Python dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: | + ./local + ./.nvm + ./node_modules + key: python-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements*.txt', 'setup.py') }} + - name: Install Python dependencies + if: steps.cache-python.outputs.cache-hit != 'true' + run: | + make V=1 install + make V=1 gecko.driver + - name: Run tests + run: make V=1 ci.test themes: name: Themes runs-on: ubuntu-20.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@v5 - with: - python-version: '3.12' - architecture: 'x64' - - name: Cache Python dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: | - ./local - ./.nvm - ./node_modules - key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - - name: Install node dependencies - run: make V=1 node.env - - name: Build themes - run: make V=1 themes.all + - 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@v5 + with: + python-version: '3.12' + architecture: 'x64' + - name: Cache Python dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: | + ./local + ./.nvm + ./node_modules + key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + - name: Install node dependencies + run: make V=1 node.env + - name: Build themes + run: make V=1 themes.all documentation: name: Documentation @@ -79,40 +79,40 @@ jobs: permissions: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: '0' - persist-credentials: false - - name: Install Ubuntu packages - run: sudo ./utils/searxng.sh install buildhost - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - architecture: 'x64' - - name: Cache Python dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: | - ./local - ./.nvm - ./node_modules - key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - - name: Build documentation - run: | - make V=1 docs.clean docs.html - - name: Deploy - if: github.ref == 'refs/heads/master' - uses: JamesIves/github-pages-deploy-action@3.7.1 - with: - GITHUB_TOKEN: ${{ github.token }} - BRANCH: gh-pages - FOLDER: dist/docs - CLEAN: true # Automatically remove deleted files from the deploy branch - SINGLE_COMMIT: True - COMMIT_MESSAGE: '[doc] build from commit ${{ github.sha }}' + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: '0' + persist-credentials: false + - name: Install Ubuntu packages + run: sudo ./utils/searxng.sh install buildhost + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + architecture: 'x64' + - name: Cache Python dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: | + ./local + ./.nvm + ./node_modules + key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + - name: Build documentation + run: | + make V=1 docs.clean docs.html + - name: Deploy + if: github.ref == 'refs/heads/master' + uses: JamesIves/github-pages-deploy-action@3.7.1 + with: + GITHUB_TOKEN: ${{ github.token }} + BRANCH: gh-pages + FOLDER: dist/docs + CLEAN: true # Automatically remove deleted files from the deploy branch + SINGLE_COMMIT: true + COMMIT_MESSAGE: '[doc] build from commit ${{ github.sha }}' babel: name: Update translations branch @@ -125,37 +125,37 @@ jobs: permissions: contents: write # for make V=1 weblate.push.translations steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: '0' - token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - architecture: 'x64' - - name: Cache Python dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: | - ./local - ./.nvm - ./node_modules - key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - - name: weblate & git setup - env: - WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} - run: | - mkdir -p ~/.config - echo "${WEBLATE_CONFIG}" > ~/.config/weblate - git config --global user.email "searxng-bot@users.noreply.github.com" - git config --global user.name "searxng-bot" - - name: Update transations - id: update - run: | - make V=1 weblate.push.translations + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: '0' + token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + architecture: 'x64' + - name: Cache Python dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: | + ./local + ./.nvm + ./node_modules + key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + - name: weblate & git setup + env: + WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} + run: | + mkdir -p ~/.config + echo "${WEBLATE_CONFIG}" > ~/.config/weblate + git config --global user.email "searxng-bot@users.noreply.github.com" + git config --global user.name "searxng-bot" + - name: Update transations + id: update + run: | + make V=1 weblate.push.translations dockers: name: Docker diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index e1a8e99e5..002a1278e 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -1,5 +1,5 @@ name: "Security checks" -on: +on: # yamllint disable-line rule:truthy schedule: - cron: "42 05 * * *" workflow_dispatch: diff --git a/.github/workflows/translations-update.yml b/.github/workflows/translations-update.yml index ea0116662..ac611adea 100644 --- a/.github/workflows/translations-update.yml +++ b/.github/workflows/translations-update.yml @@ -1,5 +1,5 @@ name: "Update translations" -on: +on: # yamllint disable-line rule:truthy schedule: - cron: "05 07 * * 5" workflow_dispatch: @@ -10,50 +10,50 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository_owner == 'searxng' && github.ref == 'refs/heads/master' }} steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: '0' - token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - architecture: 'x64' - - name: Cache Python dependencies - id: cache-python - uses: actions/cache@v3 - with: - path: | - ./local - ./.nvm - ./node_modules - key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} - - name: weblate & git setup - env: - WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} - run: | - mkdir -p ~/.config - echo "${WEBLATE_CONFIG}" > ~/.config/weblate - git config --global user.email "searxng-bot@users.noreply.github.com" - git config --global user.name "searxng-bot" - - name: Merge and push transation updates - run: | - make V=1 weblate.translations.commit - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - commit-message: '[l10n] update translations from Weblate' - committer: searxng-bot - author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - signoff: false - branch: translations_update - delete-branch: true - draft: false - title: '[l10n] update translations from Weblate' - body: | - update translations from Weblate - labels: | - translation + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: '0' + token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + architecture: 'x64' + - name: Cache Python dependencies + id: cache-python + uses: actions/cache@v3 + with: + path: | + ./local + ./.nvm + ./node_modules + key: python-ubuntu-20.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + - name: weblate & git setup + env: + WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} + run: | + mkdir -p ~/.config + echo "${WEBLATE_CONFIG}" > ~/.config/weblate + git config --global user.email "searxng-bot@users.noreply.github.com" + git config --global user.name "searxng-bot" + - name: Merge and push transation updates + run: | + make V=1 weblate.translations.commit + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} + commit-message: '[l10n] update translations from Weblate' + committer: searxng-bot + author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> + signoff: false + branch: translations_update + delete-branch: true + draft: false + title: '[l10n] update translations from Weblate' + body: | + update translations from Weblate + labels: | + translation