Skip to content

Commit 79a87af

Browse files
refactor: ♻️ use date as release name, optimize a minor piece of code in OSS
1 parent 466a0f5 commit 79a87af

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.github/workflows/workflow.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14+
- name: set env
15+
run: echo "NOW=v$(date +'%Y%m%d.%H%M%S')" >> $GITHUB_ENV
16+
1417
- uses: actions/checkout@v2
1518

1619
- name: Set up Go
1720
uses: actions/setup-go@v2
1821
with:
1922
go-version: 1.17
2023

24+
2125
- name: Build
2226
run: |
2327
mkdir -p output
@@ -68,8 +72,8 @@ jobs:
6872
if: ${{ !env.ACT }}
6973
with:
7074
repo_token: "${{ secrets.GITHUB_TOKEN }}"
71-
automatic_release_tag: "latest"
75+
automatic_release_tag: "${{ env.NOW }}"
7276
prerelease: false
73-
title: "${{ github.sha }}"
77+
title: "${{ env.NOW }}"
7478
files: |
7579
output/*

oss/oss.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,16 @@ func findRange(issue ossIssue, doc sglsp.TextDocumentItem) sglsp.Range {
137137
lines := strings.Split(
138138
strings.ReplaceAll(doc.Text, "\r", ""),
139139
"\n")
140+
var packageName string
141+
if len(issue.From) > 1 {
142+
split := strings.Split(issue.From[1], "@")
143+
packageName = fmt.Sprintf("\"%s\": \"", split[0])
144+
} else {
145+
packageName = fmt.Sprintf("\"%s\": \"", issue.Name)
146+
}
140147
var lineStart, lineEnd, characterStart, characterEnd int
141148
for i := 0; i < len(lines); i++ {
142149
line := lines[i]
143-
var packageName string
144-
if len(issue.From) > 1 {
145-
split := strings.Split(issue.From[1], "@")
146-
packageName = fmt.Sprintf("\"%s\": \"", split[0])
147-
} else {
148-
packageName = fmt.Sprintf("\"%s\": \"", issue.Name)
149-
}
150150
if issue.PackageManager == "npm" {
151151
if strings.HasPrefix(
152152
strings.TrimSpace(strings.ReplaceAll(line, "^", "")), packageName) {
@@ -157,7 +157,7 @@ func findRange(issue ossIssue, doc sglsp.TextDocumentItem) sglsp.Range {
157157
break
158158
} else if issue.PackageManager == "maven" {
159159
// todo respect from
160-
packageName = strings.Split(strings.ReplaceAll(packageName, "\"", ""), ":")[0]
160+
packageName = strings.Split(strings.ReplaceAll(packageName, "\"", ""), ":")[1]
161161
if filepath.Base(string(doc.URI)) == "pom.xml" &&
162162
strings.Contains(
163163
line, fmt.Sprintf("<artifactId>%s</artifactId>", packageName),

0 commit comments

Comments
 (0)