Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate v5.0.10 #890

Merged
merged 64 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
9c55637
compiler-js: setup crossProject for graph-ir module
aslesarenko Jun 13, 2023
16eb500
compiler-js: drop Scala 2.12 for JS
aslesarenko Jun 13, 2023
8501776
compiler-js: introduce scalan.reflection.Platform and fix JS compilation
aslesarenko Jun 13, 2023
f50dc93
compiler-js: all tests of graphir module passed under JS
aslesarenko Jun 13, 2023
8674534
compiler-js: setup crossProject for sc module and make it compile
aslesarenko Jun 14, 2023
2e2ba72
compiler-js: configure sc.js to fix tests running
aslesarenko Jun 14, 2023
c64af30
compiler-js: some cleanups to avoid warnings
aslesarenko Jun 14, 2023
04d4055
compiler-js: fix some tests for JS
aslesarenko Jun 15, 2023
2ca44cd
compiler-js: fix JVM tests
aslesarenko Jun 15, 2023
7ffdd79
compiler-js: fix most test under JS (except crypto)
aslesarenko Jun 16, 2023
eec4e5e
compiler-js: fix sc/test execution + upgrade sbt
aslesarenko Jun 16, 2023
0a023e1
compiler-js: introduce Environment
aslesarenko Jun 16, 2023
7cfdd48
compiler-js: return TypesSpecification.scala to shared
aslesarenko Jun 16, 2023
ba23ca5
compiler-js: fix compilation
aslesarenko Jun 17, 2023
db4ee8a
compiler-js: tests for liftToConstant
aslesarenko Jun 17, 2023
d8e4ccd
compiler-js: fix compilation
aslesarenko Jun 17, 2023
7bd9bab
compiler-js: reconfigure ScalablyTyped and update scrypto dep to SNAP…
aslesarenko Jun 26, 2023
b458142
compiler-js: upgrade Scala version used in CI
aslesarenko Jun 26, 2023
12bb04c
compiler-js: upgrade Scala version used in CI (2)
aslesarenko Jun 26, 2023
b1b2163
compiler-js: update scrypto deps and Sbt version
aslesarenko Jun 29, 2023
ca5ce26
compiler-js: update sbt version, turn off coverage, run more js tests…
aslesarenko Jun 29, 2023
fa0841c
compiler-js: update js deps
aslesarenko Jun 30, 2023
5dcb820
Merge branch 'ScorexFoundation:develop' into fix-npm-dependencies
Jun 30, 2023
1cc06bc
sigma-js: fix `prepublishOnly` script
Jun 30, 2023
dbda983
sigma-js: map js output file as node module
Jun 30, 2023
4c59725
sigma-js: clean up
Jun 30, 2023
3f36cda
Merge pull request #886 from anon-br/fix-npm-dependencies
aslesarenko Jun 30, 2023
7004c12
compiler-js: update lib versions
aslesarenko Jul 1, 2023
7132e35
compiler-js: fix DeserializationResilience
aslesarenko Jul 1, 2023
1ac06c8
compiler-js: xxxObj suffix for companions + added SigmaCompiler + js …
aslesarenko Jul 1, 2023
7a1dfc0
compiler-js: tests for js.SigmaCompiler, bump Sigma.js version 0.1.0
aslesarenko Jul 1, 2023
04ce570
compiler-js: more sc.spec.js tests
aslesarenko Jul 1, 2023
85babc5
compiler-js: README.md
aslesarenko Jul 1, 2023
e90b1f3
compiler-js: README.md fix urls
aslesarenko Jul 1, 2023
99cfe60
compiler-js: cleanup README.md
aslesarenko Jul 1, 2023
79df4ca
compiler-js: added properties to js.ErgoTree
aslesarenko Jul 2, 2023
80af306
compiler-js: fix equality of CErgoLikeStateContext
aslesarenko Jul 3, 2023
8b45afb
compiler-js: update scorex-util and scrypto deps
aslesarenko Jul 4, 2023
933acd7
compiler-js: rename sigma-js test files
aslesarenko Jul 6, 2023
27ed092
compiler-js: fix URLs in README.md
aslesarenko Jul 6, 2023
5986387
compiler-js: implemented js.Value for BigInt
aslesarenko Jul 6, 2023
24a0c8d
compiler-js: implemented js.Value for GroupElement
aslesarenko Jul 6, 2023
411b1f6
compiler-js: implemented js.Value for SigmaProp
aslesarenko Jul 6, 2023
ccdf546
compiler-js: implemented js.Value for AvlTree
aslesarenko Jul 6, 2023
3c258af
compiler-js: implemented js.Value for Box
aslesarenko Jul 6, 2023
11874fb
compiler-js: implemented js.Value for Unit, Boolean
aslesarenko Jul 6, 2023
0c38343
compiler-js: unused imports
aslesarenko Jul 12, 2023
08bb384
Merge pull request #885 from ScorexFoundation/compiler-js
aslesarenko Jul 12, 2023
b65c47a
include npm lock file
arobsn Jul 12, 2023
c8079b8
add TS typedefs
arobsn Jul 12, 2023
9282f0c
Merge pull request #891 from ScorexFoundation/add-sigmajs-types
aslesarenko Jul 12, 2023
ac1f3d3
sigma-js bump verson v0.2.1
aslesarenko Jul 12, 2023
e833bf2
Add JS CI (#892)
arobsn Jul 14, 2023
db8d9db
v5.0.10-RC: cleanup + ScalaDocs
aslesarenko Jul 18, 2023
72baa09
v5.0.10-RC: change type of AvlTreeData.digest
aslesarenko Jul 18, 2023
7550d6b
v5.0.10-RC: fix test
aslesarenko Jul 18, 2023
4d96fdc
tree-template: implemented fromHex, templateHex
aslesarenko Jul 26, 2023
ae2d144
Tree template types (#895)
arobsn Jul 26, 2023
1c7b9dc
Merge pull request #894 from ScorexFoundation/tree-template
aslesarenko Jul 26, 2023
b4a65a1
secure-random-js: upgrade sigmajsCryptoFacadeVersion = "0.0.7" and im…
aslesarenko Aug 1, 2023
5b35813
secure-random-js: add ScalaDoc
aslesarenko Aug 4, 2023
acffbef
secure-random-js: fixed js Platform.exponentiatePoint
aslesarenko Aug 4, 2023
9595070
secure-random-js: ci.yml: run scJS/test
aslesarenko Aug 4, 2023
595fbb8
Merge pull request #898 from ScorexFoundation/secure-random-js
aslesarenko Aug 7, 2023
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
54 changes: 32 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.10, 2.11.12]
scala: [2.13.11, 2.12.18, 2.11.12]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -47,18 +47,8 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Runs tests and collect coverage
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} coverage test coverageReport coverageAggregate

# - name: Upload coverage report
# run: sbt ++${{ matrix.scala }} coverageReport coverageAggregate coveralls
# env:
# COVERALLS_REPO_TOKEN: $${{ secrets.COVERALLS_REPO_TOKEN }}

- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v1
with:
fail_ci_if_error: false
- name: Runs tests
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} test

- name: Publish a snapshot ${{ github.ref }}
if: env.HAS_SECRETS == 'true'
Expand All @@ -68,15 +58,15 @@ jobs:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

buildJs:
name: JS - Test and publish a snapshot
name: JS - Test and publish snapshots
env:
HAS_SECRETS: ${{ secrets.SONATYPE_PASSWORD != '' }}
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.10]
scala: [2.13.11]
java: [adopt@1.8]
node-version: [16.x]
node-version: [20]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand All @@ -85,12 +75,15 @@ jobs:
fetch-depth: 0

- name: Setup NPM
uses: pnpm/action-setup@v2
uses: actions/setup-node@v3
with:
version: 7.21.0
node-version: ${{ matrix.node-version }}
cache: "pnpm"
- run: pnpm install --prefix sigma-js
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: ./sigma-js/package-lock.json

- name: Install NPM dependencies
run: npm ci --prefix sigma-js

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
Expand All @@ -110,11 +103,28 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Runs tests and collect coverage
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} commonJS/test corelibJS/test interpreterJS/test
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} commonJS/test corelibJS/test interpreterJS/test graphirJS/test sdkJS/test scJS/test

- name: Publish a snapshot ${{ github.ref }}
- name: Publish a JVM snapshot ${{ github.ref }}
if: env.HAS_SECRETS == 'true'
run: sbt ++${{ matrix.scala }} sdkJS/publish
env:
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

- name: JS Build
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} scJS/fastOptJS

- name: Runs JS tests
run: npm run test
working-directory: ./sigma-js

- name: Setup JS snapshot
run: npm run ci:snapshot
working-directory: ./sigma-js

- name: Publish JS snapshot ${{ github.ref }}
run: npm publish --tag snapshot
working-directory: ./sigma-js
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
22 changes: 22 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Setup NPM
uses: actions/setup-node@v3
with:
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: ./sigma-js/package-lock.json

- name: Install NPM dependencies
run: npm ci --prefix sigma-js
# Ensure latest npm version to be installed for npm provenance support
- run: npm install -g npm

- name: Import GPG key
run: ci/import_gpg.sh
env:
Expand All @@ -42,3 +55,12 @@ jobs:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

- name: JS Build
run: sbt -jvm-opts ci/ci.jvmopts scJS/fastOptJS

- name: Publish JS snapshot ${{ github.ref }}
run: npm publish --provenance
working-directory: ./sigma-js
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ docs/spec/out/
test-out/
flamegraphs/
node_modules/
package-lock.json
sigma-js/.npmrc
sigma-js/dist/

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ By default SBT uses Scala 2.12 for compilation and running tests. To compile for

```shell
$ sbt
sbt:sigma-state> ++2.13.8
sbt:sigma-state> ++2.13.11
sbt:sigma-state> compile
sbt:sigma-state> test
```
Expand Down
Loading
Loading