Skip to content

Commit

Permalink
chore: rename integration to core_js
Browse files Browse the repository at this point in the history
  • Loading branch information
freaz committed Sep 12, 2023
1 parent 557de8d commit 927810f
Show file tree
Hide file tree
Showing 70 changed files with 26 additions and 29 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
registry-url: https://registry.npmjs.org/
node-version: "18"
cache: yarn
cache-dependency-path: integration/yarn.lock
cache-dependency-path: core_js/yarn.lock
- name: Cache cargo registry and build directory
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -72,8 +72,8 @@ jobs:
name: test-core-wasm
path: core/dist/test-core.wasm

integration:
name: Integration (Map STD)
core_js:
name: Core JS (Map STD)
runs-on: ubuntu-latest
steps:
# checkout
Expand All @@ -84,23 +84,23 @@ jobs:
registry-url: https://registry.npmjs.org/
node-version: "18"
cache: yarn
cache-dependency-path: integration/yarn.lock
cache-dependency-path: core_js/yarn.lock
# test and build
- name: Install Yarn dependencies
working-directory: integration
working-directory: core_js
run: yarn install --frozen-lockfile
## first we need map-std which is used in profile-validator
- name: Build Map STD
working-directory: integration/map-std
working-directory: core_js/map-std
run: yarn build
- name: Test Map STD
working-directory: integration/map-std
working-directory: core_js/map-std
run: yarn test
- name: Build Profile validator
working-directory: integration/profile-validator
working-directory: core_js/profile-validator
run: yarn build
- name: Test Profile validator
working-directory: integration/profile-validator
working-directory: core_js/profile-validator
run: yarn test

host-nodejs:
Expand Down
33 changes: 15 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ CORE_ASYNCIFY_WASM=${CORE_DIST}/core-async.wasm
# Test core
TEST_CORE_WASM=${CORE_DIST}/test-core.wasm
TEST_CORE_ASYNCIFY_WASM=${CORE_DIST}/test-core-async.wasm
# Integration
# Core JS
CORE_JS_ASSETS=core/core/assets/js
CORE_JS_ASSETS_MAP_STD=${CORE_JS_ASSETS}/map_std.js
CORE_JS_ASSETS_PROFILE_VALIDATOR=${CORE_JS_ASSETS}/profile_validator.js
MAP_STD=integration/map-std/dist/map_std.js
PROFILE_VALIDATOR=integration/profile-validator/dist/profile_validator.js
MAP_STD=core_js/map-std/dist/map_std.js
PROFILE_VALIDATOR=core_js/profile-validator/dist/profile_validator.js
CORE_SCHEMA_ASSETS=core/core/assets/schemas
CORE_SCHEMA_ASSETS_SECURITY_VALUES=${CORE_SCHEMA_ASSETS}/security_values.json
CORE_SCHEMA_ASSETS_PARAMETERS_VALUES=${CORE_SCHEMA_ASSETS}/parameters_values.json
Expand All @@ -60,9 +60,9 @@ ifeq ($(CORE_PHONY),1)
endif

deps: git_hooks deps_core deps_packages
build: build_core build_integration build_packages
build: build_core build_core_js build_packages
test: test_core test_packages
clean: clean_core clean_integration
clean: clean_core clean_core_js

git_hooks:
cp .githooks/* .git/hooks
Expand Down Expand Up @@ -123,24 +123,21 @@ ${CORE_SCHEMA_ASSETS_PARAMETERS_VALUES}:
clean_core:
rm -rf ${CORE_DIST} core/target

#################
## INTEGRATION ##
#################
build_integration: ${MAP_STD} ${PROFILE_VALIDATOR}
#############
## Core JS ##
#############
build_core_js: ${MAP_STD} ${PROFILE_VALIDATOR}

${MAP_STD}:
cd integration && yarn install && yarn workspace @superfaceai/map-std build

cd core_js && yarn install && yarn workspace @superfaceai/map-std build
${PROFILE_VALIDATOR}:
cd integration && yarn install && yarn workspace @superfaceai/profile-validator build

test_integration:
cd integration && \
cd core_js && yarn install && yarn workspace @superfaceai/profile-validator build
test_core_js:
cd core_js && \
yarn workspace @superfaceai/map-std test && \
yarn workspace @superfaceai/profile-validator test

clean_integration:
rm -rf integration/map-std/dist integration/map-std/types integration/profile-validator/dist
clean_core_js:
rm -rf core_js/map-std/dist core_js/map-std/types core_js/profile-validator/dist

##############
## PACKAGES ##
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions integration/package.json → core_js/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@superfaceai/integration",
"name": "@superfaceai/core-js",
"version": "0.1.0",
"private": true,
"workspaces": [
"core-ffi",
"map-std",
"profile-validator"
]
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 927810f

Please sign in to comment.