Merge remote-tracking branch 'origin/master'

flock-community · Oct 20, 2023 · f13a288 · f13a288
2 parents 3e9c529 + 689c7b8
commit f13a288
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/actions/version/action.yml b/.github/actions/version/action.yml
@@ -16,7 +16,7 @@ runs:
       name: Version number
       shell: bash
       run: |
-        if [[ "${{ inputs.version }}" =~ ^v[0-9]\.[0-9]\.[0-9]$ ]]
+        if [[ "${{ inputs.version }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]
         then
         echo "version number valid: ${{ inputs.version }}"
         version="${{ inputs.version }}"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: wirespec-cli-linux
-          path: compiler/cli/build/bin/linuxX64/releaseExecutable/cli.kexe
+          path: src/compiler/cli/build/bin/linuxX64/releaseExecutable/cli.kexe
       - name: Archive vscode extension
         uses: actions/upload-artifact@v3
         with:
@@ -80,12 +80,12 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: wirespec-cli-macos-x86
-          path: compiler/cli/build/bin/macosX64/releaseExecutable/cli.kexe
+          path: src/compiler/cli/build/bin/macosX64/releaseExecutable/cli.kexe
       - name: Archive macosArm64 cli
         uses: actions/upload-artifact@v3
         with:
           name: wirespec-cli-macos-arm64
-          path: compiler/cli/build/bin/macosArm64/releaseExecutable/cli.kexe
+          path: src/compiler/cli/build/bin/macosArm64/releaseExecutable/cli.kexe
 
   version:
 
@@ -288,6 +288,7 @@ jobs:
         run: |
           ./gradlew :src:compiler:core:publish
           ./gradlew :src:compiler:lib:publish
+          ./gradlew :src:openapi:publish
 
   release-lib-npm:
 
@@ -317,6 +318,6 @@ jobs:
         run: |
           ./gradlew :src:compiler:lib:build
       - name: Build
-        working-directory: ./build/js
+        working-directory: ./src/compiler/lib/build/dist/js/productionLibrary
         run: |
           npm publish --access public
diff --git a/src/compiler/lib/build.gradle.kts b/src/compiler/lib/build.gradle.kts
@@ -12,12 +12,12 @@ repositories {
 }
 
 kotlin {
-    js(IR) {
+    js {
         nodejs()
         binaries.library()
         compilations["main"].packageJson {
             customField("name", "@flock/wirespec")
-            customField("bin", mapOf("wirespec" to "kotlin/wirespec-bin.js"))
+            customField("bin", mapOf("wirespec" to "wirespec-bin.js"))
         }
     }