From 56a4e4baefb1e96e7df3c1ac3351504a077ffe07 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 14 Jun 2024 11:04:08 -0400 Subject: [PATCH] Prepare to build releases from branches --- .github/workflows/aggregate-distro-update-sites.yml | 6 +++--- .github/workflows/build-vscode-extension.yml | 7 +++++++ .github/workflows/eclipse-ls-extensions-build.yml | 1 + .github/workflows/release-eclipse-distro-build.yml | 8 ++++++++ .github/workflows/release-eclipse-ls-extensions.yml | 6 ++++++ .github/workflows/release-vscode-extension.yml | 7 +++++++ .../boot/java/data/jpa/queries/QueryProblemType.java | 3 ++- 7 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml index 04826a754..1dcd45a6a 100644 --- a/.github/workflows/aggregate-distro-update-sites.yml +++ b/.github/workflows/aggregate-distro-update-sites.yml @@ -53,10 +53,10 @@ jobs: echo "Found ${dir}" dir_name=${dir:0:-1} site_url="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}" - if [[ ${dir_name} == "e4.32" ]]; then - ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url true + if [[ ${dir_name} == "e4.30" ]] || ; then + ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url else - ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url + ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url true fi cat ./compositeArtifacts.xml cat ./compositeContent.xml diff --git a/.github/workflows/build-vscode-extension.yml b/.github/workflows/build-vscode-extension.yml index 6bba71c1b..6bdfb7249 100644 --- a/.github/workflows/build-vscode-extension.yml +++ b/.github/workflows/build-vscode-extension.yml @@ -12,6 +12,11 @@ on: required: false type: string default: snapshot + ref: + description: Git branch, tag, commit hash + required: false + default: 'main' + type: string permissions: contents: write @@ -23,6 +28,8 @@ jobs: steps: - name: Checkout vscode-extensions code and workflow scripts uses: actions/checkout@v4 + with: + ref: ${{ inputs.ref }} - name: Set up JDK 17 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index ed29136ff..489dfb38b 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -40,6 +40,7 @@ jobs: steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 with: + ref: ${{ inputs.ref }} sparse-checkout: | .github headless-services diff --git a/.github/workflows/release-eclipse-distro-build.yml b/.github/workflows/release-eclipse-distro-build.yml index ace5cb1fd..752b042c9 100644 --- a/.github/workflows/release-eclipse-distro-build.yml +++ b/.github/workflows/release-eclipse-distro-build.yml @@ -11,6 +11,11 @@ on: description: Last segments of an s3 path for p2 Repo for eclipse ls extensions required: true type: string + ref: + description: Git branch, tag, commit hash + required: false + default: 'main' + type: string jobs: @@ -21,6 +26,7 @@ jobs: build_type: 'release' p2-qualifier: 'RELEASE' sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} + ref: ${{ inputs.ref }} java_version: '17' secrets: inherit @@ -31,6 +37,7 @@ jobs: build_type: 'release' p2-qualifier: 'RELEASE' sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} + ref: ${{ inputs.ref }} java_version: '21' secrets: inherit @@ -41,5 +48,6 @@ jobs: build_type: 'release' p2-qualifier: 'RELEASE' sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} + ref: ${{ inputs.ref }} java_version: '21' secrets: inherit diff --git a/.github/workflows/release-eclipse-ls-extensions.yml b/.github/workflows/release-eclipse-ls-extensions.yml index 5d8573f57..1b0198e0c 100644 --- a/.github/workflows/release-eclipse-ls-extensions.yml +++ b/.github/workflows/release-eclipse-ls-extensions.yml @@ -11,6 +11,11 @@ on: description: Last segments of an s3 path for p2 Repo for eclipse ls extensions required: true type: string + ref: + description: Git branch, tag, commit hash + required: false + default: 'main' + type: string jobs: @@ -21,4 +26,5 @@ jobs: build_type: 'release' skip_tests: true sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }} + ref: ${{ inputs.ref }} secrets: inherit diff --git a/.github/workflows/release-vscode-extension.yml b/.github/workflows/release-vscode-extension.yml index d910f20cf..c77860d2f 100644 --- a/.github/workflows/release-vscode-extension.yml +++ b/.github/workflows/release-vscode-extension.yml @@ -11,6 +11,11 @@ on: description: For example "RC1" required: true type: string + ref: + description: Git branch, tag, commit hash + required: false + default: 'main' + type: string permissions: contents: write @@ -24,6 +29,7 @@ jobs: - name: Checkout vscode-extension '${{ inputs.extension-name }}' uses: actions/checkout@v4 with: + ref: ${{ inputs.ref }} sparse-checkout: | vscode-extensions/${{ inputs.extension-name }} - name: Record Extension Version @@ -50,4 +56,5 @@ jobs: with: extension-name: ${{ inputs.extension-name }} dist: 'release' + ref: ${{ inputs.ref }} secrets: inherit diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryProblemType.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryProblemType.java index 448231310..3e1211c08 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryProblemType.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryProblemType.java @@ -11,6 +11,7 @@ package org.springframework.ide.vscode.boot.java.data.jpa.queries; import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.ERROR; +import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.IGNORE; import org.springframework.ide.vscode.boot.common.SpringProblemCategories; import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemCategory; @@ -21,7 +22,7 @@ public enum QueryProblemType implements ProblemType { JPQL_SYNTAX(ERROR, "Syntax", "JPQL Query Syntax"), HQL_SYNTAX(ERROR, "Syntax", "HQL Query Syntax"), - SQL_SYNTAX(ERROR, "Syntax", "SQL Query Syntax"); + SQL_SYNTAX(IGNORE, "Syntax", "SQL Query Syntax"); private final ProblemSeverity defaultSeverity; private String description;