From 77fcdd843480915faf99d3514505fcceb65075f0 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 27 Feb 2023 17:57:47 -0800 Subject: [PATCH 1/3] Check against fix-tsc branch and use types from npm --- .github/workflows/ts-tests.yml | 2 +- org.lflang/src/lib/ts/package.json | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml index 24e40b7eef..5bbc62258f 100644 --- a/.github/workflows/ts-tests.yml +++ b/.github/workflows/ts-tests.yml @@ -28,7 +28,7 @@ jobs: if: ${{ runner.os == 'macOS' }} - name: Perform TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="fix-tsc" - name: Report to CodeCov uses: codecov/codecov-action@v3.1.1 with: diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json index 34e171c54d..305d7ce524 100644 --- a/org.lflang/src/lib/ts/package.json +++ b/org.lflang/src/lib/ts/package.json @@ -17,8 +17,12 @@ "rimraf": "^3.0.2" }, "devDependencies": { + "@types/command-line-args": "^5.2.0", + "@types/command-line-usage": "^5.0.2", + "@types/jest": "^27.0.0", + "@types/microtime": "^2.1.0", + "@types/node": "^16.3.3", "@types/google-protobuf": "^3.7.4", - "@types/node": "^13.9.2", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "5.33.0", "@typescript-eslint/parser": "^5.8.1", From 4184867636897338e6cdd5961715f2e8567f9c96 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 27 Feb 2023 18:11:04 -0800 Subject: [PATCH 2/3] Fix -Druntime parameter --- .github/workflows/ts-tests.yml | 2 +- test/TypeScript/README.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml index 5bbc62258f..603c3d6bf0 100644 --- a/.github/workflows/ts-tests.yml +++ b/.github/workflows/ts-tests.yml @@ -28,7 +28,7 @@ jobs: if: ${{ runner.os == 'macOS' }} - name: Perform TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="fix-tsc" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#fix-tsc" - name: Report to CodeCov uses: codecov/codecov-action@v3.1.1 with: diff --git a/test/TypeScript/README.md b/test/TypeScript/README.md index c2e04e2efd..c865f31894 100644 --- a/test/TypeScript/README.md +++ b/test/TypeScript/README.md @@ -9,6 +9,11 @@ To run the tests with an alternative runtime, use the `-Druntime` flag to specif ``` ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="~/lf-lang/reactor-ts" ``` +- To point to a branch of a remote repository, use: +``` +-Druntime="git://github.com/lf-lang/reactor-ts.git#branch-name +``` + - Note that `lfc` can be pointed to an alternative runtime as well, using the `external-runtime-path` switch: ``` lfc test/TypeScript/src/Minimal.lf --external-runtime-path ~/lf-lang/reactor-ts From 06586b0d20a5ccd7f2e2c5a950930a9b88f96755 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 27 Feb 2023 21:42:47 -0800 Subject: [PATCH 3/3] Use published version of reactor-ts --- .github/workflows/ts-tests.yml | 2 +- org.lflang/src/lib/ts/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml index 603c3d6bf0..24e40b7eef 100644 --- a/.github/workflows/ts-tests.yml +++ b/.github/workflows/ts-tests.yml @@ -28,7 +28,7 @@ jobs: if: ${{ runner.os == 'macOS' }} - name: Perform TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#fix-tsc" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* - name: Report to CodeCov uses: codecov/codecov-action@v3.1.1 with: diff --git a/org.lflang/src/lib/ts/package.json b/org.lflang/src/lib/ts/package.json index 305d7ce524..47dfa5153f 100644 --- a/org.lflang/src/lib/ts/package.json +++ b/org.lflang/src/lib/ts/package.json @@ -2,7 +2,7 @@ "name": "LinguaFrancaDefault", "type": "commonjs", "dependencies": { - "@lf-lang/reactor-ts": "0.3.0", + "@lf-lang/reactor-ts": "0.3.1", "@babel/cli": "^7.8.4", "@babel/core": "^7.8.7", "@babel/node": "^7.8.7",