Skip to content

Commit 7d078c5

Browse files
authored
Merge pull request #644 from JetBrains/252-cherrypick-release
QD-12104 set 252 as release (#640)
2 parents c9f1bac + 7a706e6 commit 7d078c5

File tree

4 files changed

+31
-64
lines changed

4 files changed

+31
-64
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ jobs:
2828
with:
2929
cache-dependency-path: "**/*.sum"
3030
go-version-file: go.work
31+
- name: Set GOROOT and PATH from setup-go (Windows)
32+
if: runner.os == 'Windows'
33+
run: |
34+
echo "GOROOT=$(go env GOROOT)" | Out-File -FilePath $env:GITHUB_ENV -Append
35+
echo "GOPATH=$(go env GOPATH)" | Out-File -FilePath $env:GITHUB_ENV -Append
36+
echo "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
37+
shell: pwsh
3138
- name: Set up Java 17 for config-loader-cli.jar
3239
uses: actions/setup-java@v4
3340
with:
@@ -77,6 +84,9 @@ jobs:
7784
run: go test -v -json $(go list -f '{{.Dir}}/...' -m) -coverprofile coverage-${{ matrix.os }}.out | tparse -all -follow
7885
env:
7986
QODANA_LICENSE_ONLY_TOKEN: ${{ secrets.QODANA_LICENSE_ONLY_TOKEN }}
87+
GOROOT: ${{ env.GOROOT }}
88+
GOPATH: ${{ env.GOPATH }}
89+
PATH: ${{ env.PATH }}
8090

8191
code-quality:
8292
if: github.repository == 'jetbrains/qodana-cli'

core/startup/installers_test.go

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,26 @@ import (
2828
)
2929

3030
func TestGetIde(t *testing.T) {
31-
t.Setenv(
32-
"QD_PRODUCT_INTERNAL_FEED",
33-
fmt.Sprintf("https://packages.jetbrains.team/files/p/sa/qdist/%s/feed.json", product.ReleaseVersion),
34-
)
35-
for _, linter := range product.AllNativeLinters {
36-
eap := getIde(&product.NativeAnalyzer{Linter: linter, Eap: true})
37-
if eap == nil {
38-
t.Fail()
39-
}
31+
//goland:noinspection GoBoolExpressions
32+
if !product.IsReleased {
33+
t.Setenv(
34+
"QD_PRODUCT_INTERNAL_FEED",
35+
fmt.Sprintf("https://packages.jetbrains.team/files/p/sa/qdist/%s/feed.json", product.ReleaseVersion),
36+
)
37+
}
4038

41-
if product.IsReleased {
42-
ide := getIde(linter.NativeAnalyzer())
43-
if ide == nil {
44-
t.Fail()
39+
for _, linter := range product.AllNativeLinters {
40+
if linter.ProductCode != product.QDCPP {
41+
if product.IsReleased {
42+
ide := getIde(linter.NativeAnalyzer())
43+
if ide == nil {
44+
t.Fail()
45+
}
46+
} else {
47+
eap := getIde(&product.NativeAnalyzer{Linter: linter, Eap: true})
48+
if eap == nil {
49+
t.Fail()
50+
}
4551
}
4652
}
4753
}

core/startup/releases_test.go

Lines changed: 0 additions & 49 deletions
This file was deleted.

platform/product/product.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type Linter struct {
3434
const (
3535
ReleaseVersion = "2025.2"
3636
ShortVersion = "252"
37-
IsReleased = false
37+
IsReleased = true
3838

3939
EapSuffix = "-EAP"
4040
ReleaseVer = "release"
@@ -215,7 +215,7 @@ var (
215215
}
216216

217217
VersionsMap = map[string]string{
218-
ReleaseVer: "2025.1",
218+
ReleaseVer: "2025.2",
219219
EapVer: "2025.2",
220220
}
221221

0 commit comments

Comments
 (0)