From 95287498ce897ced2596ac9884fce387b528a5a1 Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Wed, 22 May 2024 16:00:03 +0200 Subject: [PATCH] 2024.5.17 Upgrade * Updated build and release workflows * Bumped version * Update release notes --- .github/workflows/buildService.yml | 11 +++++------ .github/workflows/releaseService.yml | 20 ++++++++++---------- Dockerfile | 2 +- manifest.yaml | 12 +++++++++--- scripts/services/migrations.ts | 2 +- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index 0376b14..299c90c 100644 --- a/.github/workflows/buildService.yml +++ b/.github/workflows/buildService.yml @@ -17,7 +17,7 @@ jobs: uses: Start9Labs/sdk@v1 - name: Checkout services repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build the service package id: build @@ -26,12 +26,11 @@ jobs: start-sdk init make PACKAGE_ID=$(yq -oy ".id" manifest.*) - echo "::set-output name=package_id::$PACKAGE_ID" + echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV shell: bash - name: Upload .s9pk - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ steps.build.outputs.package_id }}.s9pk - path: ./${{ steps.build.outputs.package_id }}.s9pk - \ No newline at end of file + name: ${{ env.package_id }}.s9pk + path: ./${{ env.package_id }}.s9pk diff --git a/.github/workflows/releaseService.yml b/.github/workflows/releaseService.yml index 427d777..f1eebb4 100644 --- a/.github/workflows/releaseService.yml +++ b/.github/workflows/releaseService.yml @@ -15,7 +15,7 @@ jobs: uses: Start9Labs/sdk@v1 - name: Checkout services repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build the service package run: | @@ -26,19 +26,19 @@ jobs: - name: Setting package ID and title from the manifest id: package run: | - echo "::set-output name=package_id::$(yq -oy ".id" manifest.*)" - echo "::set-output name=package_title::$(yq -oy ".title" manifest.*)" + echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV + echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV shell: bash - name: Generate sha256 checksum run: | - PACKAGE_ID=${{ steps.package.outputs.package_id }} + PACKAGE_ID=${{ env.package_id }} sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256 shell: bash - name: Generate changelog run: | - PACKAGE_ID=${{ steps.package.outputs.package_id }} + PACKAGE_ID=${{ env.package_id }} echo "## What's Changed" > change-log.txt yq -oy '.release-notes' manifest.* >> change-log.txt echo "## SHA256 Hash" >> change-log.txt @@ -48,15 +48,15 @@ jobs: shell: bash - name: Create GitHub Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: tag_name: ${{ github.ref_name }} - name: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }} + name: ${{ env.package_title }} ${{ github.ref_name }} prerelease: true body_path: change-log.txt files: | - ./${{ steps.package.outputs.package_id }}.s9pk - ./${{ steps.package.outputs.package_id }}.s9pk.sha256 + ./${{ env.package_id }}.s9pk + ./${{ env.package_id }}.s9pk.sha256 - name: Publish to Registry env: @@ -67,5 +67,5 @@ jobs: if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then echo "Publish skipped: missing registry credentials." else - start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ steps.package.outputs.package_id }}.s9pk + start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk fi diff --git a/Dockerfile b/Dockerfile index 5de63c4..52d0e9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM redis:alpine as redis -FROM searxng/searxng:2024.3.10-707d6270c +FROM searxng/searxng:2024.5.17-ec41b5358 USER root diff --git a/manifest.yaml b/manifest.yaml index c42147a..babdc38 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,12 +1,14 @@ id: searxng title: "SearXNG" -version: 2024.3.10 +version: 2024.5.17 release-notes: | - Updated SearXNG code to the latest version from upstream. > `Highlights` - - Use latest Alpine 3.19 as buildbase - - New engines have been implemented: `goodreads`, `ask.com`, and `mullvad leta`. + - New search engines: cargo search (crates.io), Hex.pm, Searchmysite, Gitea, Open Meteo, LibreTranslate, Mullvad Leta. + - New plugins: unit converter, calculator. + - Wikimedia Commons support for media files. + - Added keybindings for copying URLs in Hotkeys. Press "h" key on main or result page to get help. license: MIT wrapper-repo: "https://github.com/Start9Labs/searxng-startos" upstream-repo: "https://github.com/searxng/searxng-docker" @@ -29,6 +31,10 @@ main: args: [] mounts: main: /root +hardware-requirements: + arch: + - x86_64 + - aarch64 health-checks: web-ui: name: Web UI diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index 32395e4..5ac7285 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -24,5 +24,5 @@ export const migration: T.ExpectedExports.migration = ), }, }, - "2024.3.10" + "2024.5.17" );