From 099af41981ec720aec31c770f72bc0958b006dc2 Mon Sep 17 00:00:00 2001 From: Gem Lamont <106068376+gem-neo4j@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:43:05 +0100 Subject: [PATCH 1/2] Update the way we fetch the Neo version (#714) --- .github/workflows/CI.yaml | 2 +- .github/workflows/traceability-comments.yaml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 70031f357..0eae3bdd7 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -98,7 +98,7 @@ jobs: run: | neo4j_version_base=$(grep -e ".*neo4jVersionOverride.* : .*" build.gradle | cut -d ':' -f 2 | tr -d \'\" | tr -d ' ') echo "neo4j_version_base=$neo4j_version_base" - NEO4J_VERSION_CI=`aws codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --max-items 1 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" --output text | head -n 1` + NEO4J_VERSION_CI=`aws --no-cli-pager codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --status Published --query "versions[?starts_with(version, '$neo4j_version_base')].version | [0]" --output json | sed 's/"//g'` echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV" echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI" diff --git a/.github/workflows/traceability-comments.yaml b/.github/workflows/traceability-comments.yaml index 0c9a76b0e..253ab2cbd 100644 --- a/.github/workflows/traceability-comments.yaml +++ b/.github/workflows/traceability-comments.yaml @@ -1,17 +1,19 @@ -name: traceability +name: traceability-comments on: pull_request: branches: - dev types: + - labeled + - unlabeled - opened - edited - reopened - synchronize jobs: - validate-pr: + traceability-comments: runs-on: ubuntu-latest steps: - uses: neo4j/github-action-traceability@v2 @@ -19,4 +21,4 @@ jobs: global_verification_strategy: comments trello_api_key: ${{ secrets.TRELLO_API_KEY }} trello_api_token: ${{ secrets.TRELLO_API_TOKEN }} - github_api_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github_api_token: ${{ secrets.GITHUB_TOKEN }} From d69a3cab9184900e4fc14a2ce9ec1dc4927f7135 Mon Sep 17 00:00:00 2001 From: Gemma Lamont Date: Wed, 8 Jan 2025 10:53:03 +0100 Subject: [PATCH 2/2] Add 5.26 to CI building --- .github/workflows/CI.yaml | 6 +++--- .github/workflows/traceability-comments.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 0eae3bdd7..6d858e473 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ "dev" ] + branches: [ "dev", "5.26" ] pull_request: - branches: [ "dev" ] + branches: [ "dev", "5.26" ] env: CODEARTIFACT_DOWNLOAD_URL: ${{ secrets.CODEARTIFACT_DOWNLOAD_URL }} @@ -36,7 +36,7 @@ jobs: run: | neo4j_version_base=$(grep -e ".*neo4jVersionOverride.* : .*" build.gradle | cut -d ':' -f 2 | tr -d \'\" | tr -d ' ') echo "neo4j_version_base=$neo4j_version_base" - NEO4J_VERSION_CI=`aws codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --max-items 1 --query "versions[?starts_with(version,'$neo4j_version_base')] | [0].version" --output text | head -n 1` + NEO4J_VERSION_CI=`aws --no-cli-pager codeartifact list-package-versions --domain build-service-live --domain-owner ${{ secrets.AWS_ACCOUNT_ID }} --repository ci-live --format maven --namespace org.neo4j --package neo4j --sort-by PUBLISHED_TIME --status Published --query "versions[?starts_with(version, '$neo4j_version_base')].version | [0]" --output json | sed 's/"//g'` echo "NEO4J_VERSION_CI=$NEO4J_VERSION_CI" >> "$GITHUB_ENV" echo "Found NEO4j_VERSION_CI=$NEO4J_VERSION_CI" diff --git a/.github/workflows/traceability-comments.yaml b/.github/workflows/traceability-comments.yaml index 253ab2cbd..d54739cf1 100644 --- a/.github/workflows/traceability-comments.yaml +++ b/.github/workflows/traceability-comments.yaml @@ -4,6 +4,7 @@ on: pull_request: branches: - dev + - "5.26" types: - labeled - unlabeled