From c3be02af69bcbbb6c2a21cbea19a228939383e55 Mon Sep 17 00:00:00 2001 From: NicolasAlexandre Date: Mon, 29 Jan 2024 11:30:54 +0100 Subject: [PATCH] feat: allow search on UUID v7 and v8 (#647) --- .github/workflows/build.yml | 3 ++- app/services/forest_liana/search_query_builder.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abdaa6ac..8997b319 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ on: - main - beta - 7.x.x + - 8.x.x pull_request: env: @@ -73,7 +74,7 @@ jobs: name: Release runs-on: ubuntu-latest needs: [lint, test] - if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/7.x.x') + if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/7.x.x' || github.ref == 'refs/heads/8.x.x') steps: - uses: actions/checkout@v2 with: diff --git a/app/services/forest_liana/search_query_builder.rb b/app/services/forest_liana/search_query_builder.rb index b45270d5..4bc961da 100644 --- a/app/services/forest_liana/search_query_builder.rb +++ b/app/services/forest_liana/search_query_builder.rb @@ -1,6 +1,6 @@ module ForestLiana class SearchQueryBuilder - REGEX_UUID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i + REGEX_UUID = /\A[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i attr_reader :fields_searched