Skip to content

Commit

Permalink
chore: merge branch 'release/v7.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuthor committed Mar 1, 2023
2 parents d3bb5e7 + e3d03f3 commit 204449e
Show file tree
Hide file tree
Showing 15 changed files with 812 additions and 501 deletions.
53 changes: 52 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
subcommands: |
python3 scripts/download_wasm.py
npm install
kms-version: 4.2.0

lint:
needs: build
Expand All @@ -31,6 +32,51 @@ jobs:
with:
subcommands: |
npm test
kms-version: 4.2.0
regression_files: |
./node_modules/non_regression_vector.json
./node_modules/sqlite.db
cloudproof_java:
needs: test
uses: Cosmian/reusable_workflows/.github/workflows/cloudproof_java_in_docker.yml@develop
with:
branch: develop
target: x86_64-unknown-linux-gnu
extension: so
destination: linux-x86-64
os: ubuntu-20.04
kms-version: 4.2.0
copy_fresh_build: false
copy_regression_files: |
cp ./cloudproof_js/non_regression_vector.json src/test/resources/cover_crypt/non_regression/js_non_regression_vector.json
cp ./cloudproof_js/sqlite.db src/test/resources/findex/non_regression/js_sqlite.db
cloudproof_python:
needs:
- test
uses: Cosmian/reusable_workflows/.github/workflows/cloudproof_python.yml@develop
with:
branch: develop
target: x86_64-unknown-linux-gnu
kms-version: 4.2.0
copy_fresh_build: false
copy_regression_files: |
cp ./cloudproof_js/non_regression_vector.json tests/data/cover_crypt/non_regression/js_non_regression_vector.json
cp ./cloudproof_js/sqlite.db tests/data/findex/non_regression/js_sqlite.db
cloudproof_flutter:
needs:
- test
uses: Cosmian/reusable_workflows/.github/workflows/cloudproof_flutter.yml@develop
with:
branch: develop
target: x86_64-unknown-linux-gnu
extension: so
copy_fresh_build: false
copy_regression_files: |
cp ./cloudproof_js/non_regression_vector.json test/resources/cover_crypt/non_regression/js_non_regression_vector.json
cp ./cloudproof_js/sqlite.db test/resources/findex/non_regression/js_sqlite.db
example_vuejs:
needs: build_in_docker
Expand All @@ -44,6 +90,7 @@ jobs:
sleep 5
cd ../test
node chrome.mjs http://localhost:8090 http://kms:9998
kms-version: 4.2.0

example_reactjs:
needs: build_in_docker
Expand All @@ -57,6 +104,7 @@ jobs:
sleep 5
cd ../test
node chrome.mjs http://localhost:8090 http://kms:9998
kms-version: 4.2.0

example_webpack:
needs: build
Expand All @@ -75,6 +123,7 @@ jobs:
cd examples/nodejs
npm install
node test.mjs 10
kms-version: 4.2.0

example_imdb:
needs: build
Expand All @@ -99,7 +148,9 @@ jobs:
publish-dry-run:
needs:
- lint
- test
- cloudproof_java
- cloudproof_flutter
- cloudproof_python
- example_imdb
- example_full_text_search
- example_nodejs
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/js_in_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ on:
subcommands:
required: true
type: string
kms-version:
required: true
type: string
regression_files:
required: false
type: string
default: ''

jobs:
js-in-docker:
Expand All @@ -15,7 +22,7 @@ jobs:

services:
kms:
image: cosmian/kms:4.2.0
image: cosmian/kms:${{ inputs.kms-version }}
env:
COSMIAN_SERVER_URL: http://localhost:9998
KMS_PUBLIC_PATH: /tmp
Expand Down Expand Up @@ -51,3 +58,12 @@ jobs:
env:
REDIS_HOST: redis
KMS_HOST: kms

- name: Upload non-regression test vectors
if: inputs.regression_files != ''
uses: actions/upload-artifact@v3
with:
name: cloudproof_js
path: ${{ inputs.regression_files }}
retention-days: 1
if-no-files-found: error
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

All notable changes to this project will be documented in this file.

## [7.1.0] - 2023-03-01

### Features

- Create `ProgressResult` object and add tests
- Findex Cloud beta

### Miscellaneous Tasks

- `Location` conversions for numbers don't use LEB128 anymore but big-endian 8 bytes

### Testing

- Uniformize findex dataset

### Ci

- Add cross tests

---

## [7.0.1] - 2023-02-17
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ This table shows the minimum version correspondence between the various componen
| 6.0.0 | 8.0.0 | 1.0.0 | 4.0.0 |
| 6.0.1 | 8.0.0 | 2.0.0 | 4.0.0 |
| 7.0.0, 7.0.1 | 10.0.0 | 2.0.1 | 4.2.0 |
| 7.1.0 | 10.0.0 | 2.1.0 | 4.2.0 |
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cloudproof_js",
"version": "7.0.1",
"version": "7.1.0",
"license": "MIT",
"description": "Cosmian Cloudproof javascript client library",
"author": "Bruno Grieder<[email protected]>, Pauline Hochard<[email protected]>, Emmanuel Coste<[email protected]>, Thibaud Dauce<[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import typescript from "@rollup/plugin-typescript"
import { wasm } from "@rollup/plugin-wasm"
import { nodeResolve } from "@rollup/plugin-node-resolve"
import commonjs from '@rollup/plugin-commonjs';
import commonjs from "@rollup/plugin-commonjs"

const production = !process.env.ROLLUP_WATCH

Expand Down
6 changes: 2 additions & 4 deletions scripts/download_wasm.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ def download_wasm(name: str, version: str, destination: str) -> bool:
break

if missing_files:
print(
f'Missing {name} WASM. Copy {name} {version} to {destination}...'
)
print(f'Missing {name} WASM. Copy {name} {version} to {destination}...')

url = f'https://package.cosmian.com/{name}/{version}/all.zip'
try:
Expand Down Expand Up @@ -56,7 +54,7 @@ def download_wasm(name: str, version: str, destination: str) -> bool:


if __name__ == '__main__':
ret = download_wasm('findex', 'v2.0.1', 'src/pkg')
ret = download_wasm('findex', 'v2.1.0', 'src/pkg')
if ret is False and getenv('GITHUB_ACTIONS'):
download_wasm('findex', 'last_build', 'src/pkg')

Expand Down
Loading

0 comments on commit 204449e

Please sign in to comment.