Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/check-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,33 @@ jobs:
name: waves-all
- run: find -name "*.ride" -type f -exec java -cp '*' com.wavesplatform.lang.FileCompiler {} +;

ride-js-tests:
name: RIDE JS bundle tests
runs-on: ubuntu-latest
needs: check-pr
if: needs.check-pr.outputs.lang-changed == 'true'
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: '17'
cache: 'sbt'
- uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22
- name: Build combined ScalaJS artifact into ride-js-bundle/scalajs
run: sbt --batch replJS/fullOptJS
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
with:
node-version: '>=24.7.0'
- run: corepack enable
- name: Build & test @waves/ride-js
env:
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
run: |
cd ride-js-bundle
pnpm install --frozen-lockfile
pnpm test

run-integration-tests:
name: Run integration tests
# needs: check-pr
Expand Down
22 changes: 15 additions & 7 deletions .github/workflows/publish-to-npmjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,22 @@ jobs:
java-version: '17'
cache: 'sbt'
- uses: sbt/setup-sbt@508b753e53cb6095967669e0911487d2b9bc9f41 # v1.1.22
- run: sbt -Dproject.version=${{ steps.ghd.outputs.describe }} --batch ';lang-tests/test;lang-tests-js/test;repl/test;langJS/fullOptJS;replJS/fullOptJS'
# Emits the single combined ScalaJS artifact directly into ride-js-bundle/scalajs
# (see repl/js/build.sbt). lang-js is compiled transitively as a dependency of repl-js.
- run: sbt -Dproject.version=${{ steps.ghd.outputs.describe }} --batch ';lang-tests/test;repl/test;replJS/fullOptJS'
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
with:
registry-url: 'https://registry.npmjs.org'
node-version: '>=24.7.0' # Trusted publishing requires npm CLI version 11.5.1 or later.
- run: corepack enable
- name: Build & test @waves/ride-js
env:
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
run: |
cd ride-js-bundle
pnpm install --frozen-lockfile
pnpm run build
pnpm test
- if: github.event_name == 'workflow_dispatch'
run:
echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
Expand All @@ -52,10 +63,7 @@ jobs:
echo "TAG=latest" >> $GITHUB_ENV
- id: publish
run: |
cd lang/js
npm version $VERSION --no-git-tag-version
npm publish --provenance --access public --tag $TAG
cd ../../repl/js
npm version $VERSION --no-git-tag-version
cd ride-js-bundle
npm version $VERSION --no-git-tag-version --allow-same-version
npm publish --provenance --access public --tag $TAG
echo "url=https://www.npmjs.com/package/@waves/ride-lang/v/$VERSION" >> "$GITHUB_OUTPUT"
echo "url=https://www.npmjs.com/package/@waves/ride-js/v/$VERSION" >> "$GITHUB_OUTPUT"
12 changes: 1 addition & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,6 @@ lazy val `lang-tests` = project
.in(file("lang/tests"))
.dependsOn(`lang-testkit`)

lazy val `lang-tests-js` = project
.in(file("lang/tests-js"))
.enablePlugins(ScalaJSPlugin)
.dependsOn(`lang-js`)
.settings(
libraryDependencies += Dependencies.scalaJsTest.value,
testFrameworks += new TestFramework("utest.runner.Framework")
)

lazy val node = project.dependsOn(`lang-jvm`)

lazy val `node-testkit` = project
Expand Down Expand Up @@ -154,7 +145,6 @@ lazy val `waves-node` = (project in file("."))
`lang-js`,
`lang-jvm`,
`lang-tests`,
`lang-tests-js`,
`lang-testkit`,
`repl-js`,
`repl-jvm`,
Expand Down Expand Up @@ -257,7 +247,7 @@ checkPRRaw := Def
compilePRRaw,
Def.sequential(
test.all(
ScopeFilter(inProjects(`lang-tests`, `repl-jvm`, `lang-tests-js`, `grpc-server`, `node-tests`, `ride-runner`), inConfigurations(Test))
ScopeFilter(inProjects(`lang-tests`, `repl-jvm`, `grpc-server`, `node-tests`, `ride-runner`), inConfigurations(Test))
),
fullOptJS.all(ScopeFilter(inProjects(`lang-js`, `repl-js`), inConfigurations(Compile))),
assembly.all(ScopeFilter(inProjects(node))),
Expand Down
14 changes: 0 additions & 14 deletions lang/js/package.json

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions lang/tests-js/src/test/scala/com/wavesplatform/Global.scala

This file was deleted.

242 changes: 0 additions & 242 deletions lang/tests-js/src/test/scala/com/wavesplatform/JsAPITest.scala

This file was deleted.

Loading
Loading