Merge branch 'master' into staging

specs-feup · Sep 26, 2024 · 62d871b · 62d871b
2 parents 222086c + 325bb3f
commit 62d871b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/gradle.yml_ → .github/workflows/nightly.yml b/.github/workflows/gradle.yml_ → .github/workflows/nightly.yml
@@ -58,8 +58,7 @@ jobs:
         with:
           repository: specs-feup/lara-framework
           path: lara-framework
-          #ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} Disabled until PR is merged
-          ref: "feature/lara-js"
+          ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }}
 
       - name: Checkout specs-java-libs
         uses: actions/checkout@v4
@@ -117,8 +116,7 @@ jobs:
         with:
           repository: specs-feup/lara-framework
           path: lara-framework
-          #ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} Disabled until PR is merged
-          ref: "feature/lara-js"
+          ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }}
 
       - name: Setup js workspace
         run: |

diff --git a/Clava-JS/package.json b/Clava-JS/package.json
@@ -1,25 +1,26 @@
 {
-  "name": "clava-js",
-  "version": "0.0.1",
+  "name": "@specs-feup/clava",
+  "version": "3.0.0",
   "description": "A C/C++ source-to-source compiler written in Typescript",
   "type": "module",
   "files": [
     "api",
     "code",
     "src-api",
     "src-code",
-    "clang-plugin-binaries",
     "java-binaries",
     ".gitignore",
-    "jest.config.json",
+    "eslint.config.js",
+    "jest.config.js",
     "LICENSE",
     "package.json",
     "README.md",
     "tsconfig.jest.json",
-    "tsconfig.json"
+    "tsconfig.json",
+    "typedoc.config.js"
   ],
   "bin": {
-    "clava-js": "./code/index.js"
+    "clava": "./code/index.js"
   },
   "scripts": {
     "run": "node ./code/index.js",
@@ -55,7 +56,7 @@
   },
   "homepage": "https://github.com/specs-feup/clava#readme",
   "dependencies": {
-    "lara-js": "^0.0.1"
+    "@specs-feup/lara": "^3.0.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",