refactor: ♻️ use date as release name, optimize a minor piece of code…

… in OSS
snyk · Feb 4, 2022 · 79a87af · 79a87af
1 parent 466a0f5
commit 79a87af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -11,13 +11,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: set env
+        run: echo "NOW=v$(date +'%Y%m%d.%H%M%S')" >> $GITHUB_ENV
+
       - uses: actions/checkout@v2
 
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
 
+
       - name: Build
         run: |
           mkdir -p output
@@ -68,8 +72,8 @@ jobs:
         if: ${{ !env.ACT }}
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
+          automatic_release_tag: "${{ env.NOW }}"
           prerelease: false
-          title: "${{ github.sha }}"
+          title: "${{ env.NOW }}"
           files: |
             output/*
diff --git a/oss/oss.go b/oss/oss.go
@@ -137,16 +137,16 @@ func findRange(issue ossIssue, doc sglsp.TextDocumentItem) sglsp.Range {
 	lines := strings.Split(
 		strings.ReplaceAll(doc.Text, "\r", ""),
 		"\n")
+	var packageName string
+	if len(issue.From) > 1 {
+		split := strings.Split(issue.From[1], "@")
+		packageName = fmt.Sprintf("\"%s\": \"", split[0])
+	} else {
+		packageName = fmt.Sprintf("\"%s\": \"", issue.Name)
+	}
 	var lineStart, lineEnd, characterStart, characterEnd int
 	for i := 0; i < len(lines); i++ {
 		line := lines[i]
-		var packageName string
-		if len(issue.From) > 1 {
-			split := strings.Split(issue.From[1], "@")
-			packageName = fmt.Sprintf("\"%s\": \"", split[0])
-		} else {
-			packageName = fmt.Sprintf("\"%s\": \"", issue.Name)
-		}
 		if issue.PackageManager == "npm" {
 			if strings.HasPrefix(
 				strings.TrimSpace(strings.ReplaceAll(line, "^", "")), packageName) {
@@ -157,7 +157,7 @@ func findRange(issue ossIssue, doc sglsp.TextDocumentItem) sglsp.Range {
 				break
 			} else if issue.PackageManager == "maven" {
 				// todo respect from
-				packageName = strings.Split(strings.ReplaceAll(packageName, "\"", ""), ":")[0]
+				packageName = strings.Split(strings.ReplaceAll(packageName, "\"", ""), ":")[1]
 				if filepath.Base(string(doc.URI)) == "pom.xml" &&
 					strings.Contains(
 						line, fmt.Sprintf("<artifactId>%s</artifactId>", packageName),