From 6eace61e21ddb3de6aaf71b7a8fd5d10f1141b65 Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sat, 27 May 2023 23:08:28 -0700 Subject: [PATCH 01/10] Update CI so it checks out reactor-ts and use it as runtime --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2a39b2c8..b9c106a7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,13 @@ jobs: lingua-franca: runs-on: ubuntu-latest steps: + - name: Check out reactor-ts repository + uses: actions/checkout@v3 + with: + path: "ts-reactor" + fetch-depth: 0 - name: Read lingua-franca-ref.txt - run: echo "lingua-franca-ref=$(wget -qO- https://raw.githubusercontent.com/lf-lang/reactor-ts/${{ github.head_ref || github.ref_name }}/lingua-franca-ref.txt)" >> $GITHUB_ENV + run: echo echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV - name: Check out lingua-franca repository uses: actions/checkout@v3 with: @@ -34,6 +39,7 @@ jobs: ref: ${{ env.lingua-franca-ref }} fetch-depth: 0 submodules: true + path: "lingua-franca" - name: Prepare build environment uses: ./.github/actions/prepare-build-env - name: Setup Node.js environment @@ -46,5 +52,6 @@ jobs: uses: ./.github/actions/install-rti if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests + working-directory: "./lingua-franca" run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="git://github.com/lf-lang/reactor-ts.git#${{ github.head_ref || github.ref_name }}" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime=${{ github.workspace }}/ts-reactor" From 48057f06b7bf05683f99935195b39ad435fd29fc Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sat, 27 May 2023 23:20:02 -0700 Subject: [PATCH 02/10] Move lingua franca back...... --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9c106a7e..0f3a0e1c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,6 @@ jobs: ref: ${{ env.lingua-franca-ref }} fetch-depth: 0 submodules: true - path: "lingua-franca" - name: Prepare build environment uses: ./.github/actions/prepare-build-env - name: Setup Node.js environment @@ -52,6 +51,5 @@ jobs: uses: ./.github/actions/install-rti if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests - working-directory: "./lingua-franca" run: | ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime=${{ github.workspace }}/ts-reactor" From 085a43e5a1779834d2ef62a6c34b529ba6d1871f Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sat, 27 May 2023 23:22:33 -0700 Subject: [PATCH 03/10] fix bug --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f3a0e1c4..983516236 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,4 +52,4 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime=${{ github.workspace }}/ts-reactor" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="${{ github.workspace }}/ts-reactor" From 826a3181e89514a173d38e92d11b58a470e1f06f Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sat, 27 May 2023 23:47:12 -0700 Subject: [PATCH 04/10] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 983516236..50a9f7fde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: path: "ts-reactor" fetch-depth: 0 - name: Read lingua-franca-ref.txt - run: echo echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV + run: echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV - name: Check out lingua-franca repository uses: actions/checkout@v3 with: From 4f4d71b62e558fc073cab5dfa264009321da13cb Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Sat, 27 May 2023 23:55:33 -0700 Subject: [PATCH 05/10] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50a9f7fde..7efe1f153 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Check out reactor-ts repository uses: actions/checkout@v3 with: - path: "ts-reactor" + path: "reactor-ts" fetch-depth: 0 - name: Read lingua-franca-ref.txt run: echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV From 14b17cacf557bdac6be0e273cc42ccfdb0c4f98b Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sun, 28 May 2023 00:00:02 -0700 Subject: [PATCH 06/10] Update ci.yml to fix ambiguous naming --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7efe1f153..4f51a564d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,10 +28,10 @@ jobs: - name: Check out reactor-ts repository uses: actions/checkout@v3 with: - path: "reactor-ts" + path: "reactor-ts-external" fetch-depth: 0 - name: Read lingua-franca-ref.txt - run: echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV + run: echo "lingua-franca-ref=$(cat ./reactor-ts-external/lingua-franca-ref.txt)" >> $GITHUB_ENV - name: Check out lingua-franca repository uses: actions/checkout@v3 with: @@ -52,4 +52,4 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="${{ github.workspace }}/ts-reactor" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="${{ github.workspace }}/reactor-ts-external" From 33b1977c20ef8539e4dc828cf83760bfe34934ca Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Sun, 28 May 2023 13:52:39 -0700 Subject: [PATCH 07/10] Apply suggestions from code review --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f51a564d..9ec1c16e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,10 +28,10 @@ jobs: - name: Check out reactor-ts repository uses: actions/checkout@v3 with: - path: "reactor-ts-external" + path: "reactor-ts" fetch-depth: 0 - name: Read lingua-franca-ref.txt - run: echo "lingua-franca-ref=$(cat ./reactor-ts-external/lingua-franca-ref.txt)" >> $GITHUB_ENV + run: echo "lingua-franca-ref=$(cat ./reactor-ts/lingua-franca-ref.txt)" >> $GITHUB_ENV - name: Check out lingua-franca repository uses: actions/checkout@v3 with: @@ -52,4 +52,4 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests run: | - ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="${{ github.workspace }}/reactor-ts-external" + ./gradlew test --tests org.lflang.tests.runtime.TypeScriptTest.* -Druntime="file://${{ github.workspace }}/reactor-ts" From 8fbb36f25e5f24c4ae4b78d2203610614ac53b02 Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Sun, 28 May 2023 20:08:44 -0700 Subject: [PATCH 08/10] Update ci.yml --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ec1c16e6..d6e9b724e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,13 @@ jobs: repository: lf-lang/lingua-franca ref: ${{ env.lingua-franca-ref }} fetch-depth: 0 + path: "lingua-franca" submodules: true + - name: Move Lingua Franca to default pwd + run: | + shopt -s dotglob + mv -- ./lingua-franca/* ${{ github.workspace }} + shopt -u dotglob - name: Prepare build environment uses: ./.github/actions/prepare-build-env - name: Setup Node.js environment From db4a32b558542c535edb1cfedce0eae1fc1bb478 Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Thu, 29 Jun 2023 01:13:24 -0700 Subject: [PATCH 09/10] Update ci.yml --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41b2d3707..c54e36295 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,13 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18 + cache: 'npm' + cache-dependency-path: 'reactor-ts/package-lock.json' + - name: Build reactor-ts + run: | + cd ./reactor-ts + npm install + npm run build - name: Install pnpm run: npm i -g pnpm - name: Install RTI @@ -60,4 +67,4 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests run: | - ./gradlew targetTest -Ptarget=TypeScript -Druntime="file://${{ github.workspace }}/reactor-ts" + ./gradlew targetTest -Ptarget=TypeScript -Druntime="file:${{ github.workspace }}/reactor-ts" From c4a5a6d7f9a8829e534e70de7cc7433947752772 Mon Sep 17 00:00:00 2001 From: "Frank X. Blackburn" <6500159+axmmisaka@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:18:50 -0700 Subject: [PATCH 10/10] Update .github/workflows/ci.yml Co-authored-by: Marten Lohstroh --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c54e36295..d51571b7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,4 +67,4 @@ jobs: if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - name: Perform Lingua Franca TypeScript tests run: | - ./gradlew targetTest -Ptarget=TypeScript -Druntime="file:${{ github.workspace }}/reactor-ts" + ./gradlew targetTest -Ptarget=TypeScript -Druntime="file:/${{ github.workspace }}/reactor-ts"