From 1ab1fda7e1b28856d494b9de75477114e83d189d Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Fri, 12 Jan 2024 15:48:06 +0100 Subject: [PATCH] Update/2024.1.9 (#19) * Version bump * Add release note * Update Build and Release Workflows --- .github/workflows/buildService.yml | 10 ++-- .github/workflows/releaseService.yml | 86 +++++++++++++--------------- Dockerfile | 2 +- manifest.yaml | 10 ++-- scripts/services/migrations.ts | 2 +- 5 files changed, 54 insertions(+), 56 deletions(-) diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index d96d1d9..0376b14 100644 --- a/.github/workflows/buildService.yml +++ b/.github/workflows/buildService.yml @@ -20,16 +20,18 @@ jobs: uses: actions/checkout@v3 - name: Build the service package + id: build run: | git submodule update --init --recursive start-sdk init make - PACKAGE_ID=$(yq e ".id" manifest.yaml) - mv ${PACKAGE_ID}*s9pk ~/ + PACKAGE_ID=$(yq -oy ".id" manifest.*) + echo "::set-output name=package_id::$PACKAGE_ID" shell: bash - name: Upload .s9pk uses: actions/upload-artifact@v3 with: - name: ${{ env.PACKAGE_ID }}.s9pk - path: ~/*.s9pk + name: ${{ steps.build.outputs.package_id }}.s9pk + path: ./${{ steps.build.outputs.package_id }}.s9pk + \ No newline at end of file diff --git a/.github/workflows/releaseService.yml b/.github/workflows/releaseService.yml index fc3941d..427d777 100644 --- a/.github/workflows/releaseService.yml +++ b/.github/workflows/releaseService.yml @@ -1,7 +1,6 @@ name: Release Service on: - workflow_dispatch: push: tags: - 'v*.*' @@ -9,69 +8,64 @@ on: jobs: ReleasePackage: runs-on: ubuntu-latest + permissions: + contents: write steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Set up Rust Toolchain - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: stable - - name: Get StartOS Hash - run: echo "STARTOSHASH=$(git ls-remote https://github.com/Start9Labs/start-os --branch sdk | awk '{ print $1}')" >> $GITHUB_ENV - - name: Cache Packages - uses: buildjet/cache@v3 - id: packageCache - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-searxng-${{ env.STARTOSHASH }} - - name: Install Dependencies - run: | - sudo snap install yq deno - sudo apt-get install -y build-essential openssl libssl-dev libc6-dev clang libclang-dev ca-certificates + - name: Prepare StartOS SDK + uses: Start9Labs/sdk@v1 + - name: Checkout services repository uses: actions/checkout@v3 - - name: Install Package Manager - id: packageManager - if: steps.packageCache.outputs.cache-hit != 'true' - run: | - cd ~/ && git clone https://github.com/Start9Labs/start-os.git --branch sdk; - cd start-os; - git submodule update --init --recursive - cd backend; - export RUSTFLAGS=""; - export OS_ARCH=$(uname -m); - ./install-sdk.sh; + - name: Build the service package run: | git submodule update --init --recursive start-sdk init make + + - 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.*)" + shell: bash + - name: Generate sha256 checksum run: | - sha256sum searxng.s9pk > searxng.s9pk.sha256 + PACKAGE_ID=${{ steps.package.outputs.package_id }} + sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256 + shell: bash + - name: Generate changelog run: | + PACKAGE_ID=${{ steps.package.outputs.package_id }} echo "## What's Changed" > change-log.txt - yq e '.release-notes' manifest.yaml >> change-log.txt + yq -oy '.release-notes' manifest.* >> change-log.txt echo "## SHA256 Hash" >> change-log.txt echo '```' >> change-log.txt - sha256sum searxng.s9pk >> change-log.txt + sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt echo '```' >> change-log.txt - - name: Create Release + shell: bash + + - name: Create GitHub Release uses: softprops/action-gh-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref_name }} - name: SearXNG ${{ github.ref_name }} + name: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }} + prerelease: true body_path: change-log.txt files: | - searxng.s9pk - searxng.s9pk.sha256 + ./${{ steps.package.outputs.package_id }}.s9pk + ./${{ steps.package.outputs.package_id }}.s9pk.sha256 + + - name: Publish to Registry + env: + S9USER: ${{ secrets.S9USER }} + S9PASS: ${{ secrets.S9PASS }} + S9REGISTRY: ${{ secrets.S9REGISTRY }} + run: | + 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 + fi diff --git a/Dockerfile b/Dockerfile index e1b68f4..26b9529 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM redis:alpine as redis -FROM searxng/searxng:2023.11.14-b3d29cb86 +FROM searxng/searxng:2024.1.9-54a662658 USER root diff --git a/manifest.yaml b/manifest.yaml index 305eece..da98a82 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,10 +1,12 @@ id: searxng title: "SearXNG" -version: 2023.11.14 +version: 2024.1.9 release-notes: | - * Updated SearXNG code to the latest version from upstream. - * Added option to set a Tor address as the base URL. - * Slightly adjusted timeout. + - Updated SearXNG code to the latest version from upstream. + + > `Highlights` + - New engines have been implemented: `mdn`, `fyyd`, `podcastindex`, and `rottentomatoes`. + - `stract` (beta) has been added and can be chosen as both an autocompleter and engine. license: MIT wrapper-repo: "https://github.com/Start9Labs/searxng-startos" upstream-repo: "https://github.com/searxng/searxng-docker" diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index 7b34011..5899c41 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -24,5 +24,5 @@ export const migration: T.ExpectedExports.migration = ), }, }, - "2023.11.14" + "2024.1.9" );