Merge branch 'main' into dependabot/npm_and_yarn/undici-5.28.5

fwilhe2 · Feb 4, 2025 · 36c89b1 · 36c89b1
2 parents 02cb3a5 + 0e5a785
commit 36c89b1
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 31 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -28,4 +28,7 @@ jobs:
           git push
         else
           echo Release has no changelog
-        fi
+        fi
+        REL_BRANCH=$(echo ${{ steps.bump.outputs.newVersion }} | cut --delimiter "." --fields 1)
+        git checkout -b $REL_BRANCH
+        git push -f origin $REL_BRANCH
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -103,4 +103,4 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v4
-      - uses: typesafegithub/github-actions-typing@v1
+      - uses: typesafegithub/github-actions-typing@v2
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
     "@vercel/ncc": "^0.38.3",
     "eslint": "^8.51.0",
     "eslint-plugin-github": "^4.10.1",
-    "eslint-plugin-jest": "^28.9.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-prettier": "^5.2.3",
     "jest": "^28.1.1",
     "js-yaml": "^4.1.0",
     "prettier": "^3.4.2",

diff --git a/release-notes-draft.md b/release-notes-draft.md
@@ -1 +1 @@
-
+Use Proper File Separator for OS #459 by @gmitch215 
diff --git a/src/main.ts b/src/main.ts
@@ -33,29 +33,30 @@ async function run(): Promise<void> {
         if (installNative) {
           const ktNativePath = await tc.downloadTool(nativeDownloadUrl(version))
           core.debug(`Downloaded Kotlin Native ${version} to ${ktNativePath}`)
-          core.exportVariable('KOTLIN_NATIVE_HOME', ktNativePath)
 
           const ktNativePathExtractedFolder = await extractNativeArchive(ktNativePath)
           nativeCachedPath = await tc.cacheDir(ktNativePathExtractedFolder, 'kotlin-native', version)
         }
       }
     }
 
+    const s = IS_WINDOWS ? '\\' : '/'
+
     /*
     The order of addPath call here matter because both archives have a "kotlinc" binary.
     */
     if (installNative) {
-      const nativePath = `${nativeCachedPath}/kotlin-native-prebuilt-${osName()}-${osArch()}-${version}`
-      core.addPath(`${nativePath}/bin`)
+      const nativePath = `${nativeCachedPath}${s}kotlin-native-prebuilt-${osName()}-${osArch()}-${version}`
+      core.addPath(`${nativePath}${s}bin`)
       core.exportVariable('KOTLIN_NATIVE_HOME', nativePath)
-      core.debug(`Added ${nativePath}/bin to PATH`)
+      core.debug(`Added ${nativePath}${s}bin to PATH`)
       await exec.exec('kotlinc-native', ['-version'])
     }
 
-    const kotlinPath = `${cachedPath}/kotlinc`
-    core.addPath(`${kotlinPath}/bin`)
+    const kotlinPath = `${cachedPath}${s}kotlinc`
+    core.addPath(`${kotlinPath}${s}bin`)
     core.exportVariable('KOTLIN_HOME', kotlinPath)
-    core.debug(`Added ${kotlinPath}/bin to PATH`)
+    core.debug(`Added ${kotlinPath}${s}bin to PATH`)
     await exec.exec('kotlinc', ['-version'])
 
     const script = core.getInput('script')

diff --git a/yarn.lock b/yarn.lock
@@ -730,9 +730,9 @@
     undici-types "~6.19.8"
 
 "@types/node@20":
-  version "20.17.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.10.tgz#3f7166190aece19a0d1d364d75c8b0b5778c1e18"
-  integrity sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==
+  version "20.17.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.16.tgz#b33b0edc1bf925b27349e494b871ca4451fabab4"
+  integrity sha512-vOTpLduLkZXePLxHiHsBLp98mHGnl8RptV4YAO3HfKO5UHjDvySGbxKtpYfy8Sx5+WKcgc45qNreJJRVM3L6mw==
   dependencies:
     undici-types "~6.19.2"
 
@@ -1647,10 +1647,10 @@ eslint-plugin-import@^2.25.2:
     string.prototype.trimend "^1.0.8"
     tsconfig-paths "^3.15.0"
 
-eslint-plugin-jest@^28.9.0:
-  version "28.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.9.0.tgz#19168dfaed124339cd2252c4c4d1ac3688aeb243"
-  integrity sha512-rLu1s1Wf96TgUUxSw6loVIkNtUjq1Re7A9QdCCHSohnvXEBAjuL420h0T/fMmkQlNsQP2GhQzEUpYHPfxBkvYQ==
+eslint-plugin-jest@^28.11.0:
+  version "28.11.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.11.0.tgz#2641ecb4411941bbddb3d7cf8a8ff1163fbb510e"
+  integrity sha512-QAfipLcNCWLVocVbZW8GimKn5p5iiMcgGbRzz8z/P5q7xw+cNEpYqyzFMtIF/ZgF2HLOyy+dYBut+DoYolvqig==
   dependencies:
     "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0"
 
@@ -1680,10 +1680,10 @@ eslint-plugin-no-only-tests@^3.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-3.3.0.tgz#d9d42ccd4b5d099b4872fb5046cf95441188cfb5"
   integrity sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==
 
-eslint-plugin-prettier@^5.0.0, eslint-plugin-prettier@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz#d1c8f972d8f60e414c25465c163d16f209411f95"
-  integrity sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==
+eslint-plugin-prettier@^5.0.0, eslint-plugin-prettier@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.3.tgz#c4af01691a6fa9905207f0fbba0d7bea0902cce5"
+  integrity sha512-qJ+y0FfCp/mQYQ/vWQ3s7eUlFEL4PyKfAJxsnYTJ4YT73nsJBWqmEpFryxV9OeUiqmsTsYJ5Y+KDNaeP31wrRw==
   dependencies:
     prettier-linter-helpers "^1.0.0"
     synckit "^0.9.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@

		Use Proper File Separator for OS #459 by @gmitch215