1
0
Fork 0

feat(build): add bundle to JS build, add API image jobs

This commit is contained in:
Sean Sube 2023-01-06 13:05:31 -06:00
parent 03362f323b
commit 6d560afbae
3 changed files with 71 additions and 32 deletions

View File

@ -7,27 +7,6 @@ stages:
- platform:k8s - platform:k8s
- runner:shared - runner:shared
.build-dind:
extends:
- .build-base
image: docker.io/docker:20.10
services:
- docker.io/docker:20.10-dind
allow_failure: false
before_script:
- mkdir ${HOME}/.docker
- echo "${DOCKER_SECRET}" | base64 -d > ${HOME}/.docker/config.json
after_script:
- rm -rfv ${HOME}/.docker
variables:
DOCKER_CERT_PATH: "/shared/docker/client"
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://localhost:2376
DOCKER_NAME: "${CI_PROJECT_PATH}"
DOCKER_TLS_CERTDIR: "/shared/docker"
DOCKER_TLS_VERIFY: 1
VERSION_TAG: "${CI_COMMIT_REF_SLUG}"
.build-node: .build-node:
extends: extends:
- .build-base - .build-base
@ -49,19 +28,32 @@ stages:
- gui/node_modules/ - gui/node_modules/
policy: pull-push policy: pull-push
.build-oci:
extends:
- .build-base
image: docker.io/docker:20.10
services:
- docker.io/docker:20.10-dind
allow_failure: false
before_script:
- mkdir ${HOME}/.docker
- echo "${DOCKER_SECRET}" | base64 -d > ${HOME}/.docker/config.json
after_script:
- rm -rfv ${HOME}/.docker
variables:
DOCKER_CERT_PATH: "/shared/docker/client"
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://localhost:2376
DOCKER_NAME: "${CI_PROJECT_PATH}"
DOCKER_TLS_CERTDIR: "/shared/docker"
DOCKER_TLS_VERIFY: 1
VERSION_TAG: "${CI_COMMIT_REF_SLUG}"
.build-python: .build-python:
extends: extends:
- .build-base - .build-base
image: docker.io/python:3.10 image: docker.io/python:3.10
build-gui-bundle:
extends:
- .build-node
stage: build
script:
- cd gui
- make ci
build-api-coverage: build-api-coverage:
extends: extends:
- .build-python - .build-python
@ -70,9 +62,30 @@ build-api-coverage:
- cd api - cd api
- make ci - make ci
build-gui-bundle:
extends:
- .build-node
stage: build
script:
- cd gui
- make ci
.package-api-oci:
extends:
- .build-oci
stage: package
needs:
- build-api-coverage
script:
- cd api
- ${CI_PROJECT_DIR}/common/scripts/image-build.sh --push
variables:
IMAGE_ROOT: "${CI_PROJECT_DIR}/api"
IMAGE_SUFFIX: api
.package-gui-oci: .package-gui-oci:
extends: extends:
- .build-dind - .build-oci
stage: package stage: package
needs: needs:
- build-gui-bundle - build-gui-bundle
@ -83,6 +96,18 @@ build-api-coverage:
IMAGE_ROOT: "${CI_PROJECT_DIR}/gui" IMAGE_ROOT: "${CI_PROJECT_DIR}/gui"
IMAGE_SUFFIX: gui IMAGE_SUFFIX: gui
package-api-oci-alpine:
extends:
- .package-api-oci
variables:
IMAGE_FILE: Containerfile.alpine
package-api-oci-buster:
extends:
- .package-api-oci
variables:
IMAGE_FILE: Containerfile.buster
package-gui-oci-alpine: package-gui-oci-alpine:
extends: extends:
- .package-gui-oci - .package-gui-oci
@ -95,6 +120,18 @@ package-gui-oci-buster:
variables: variables:
IMAGE_FILE: Containerfile.buster IMAGE_FILE: Containerfile.buster
package-api-twine:
extends:
- .build-node
stage: package
needs:
- build-api-coverage
only:
- tags
script:
- cd api
- echo make package
package-gui-npm: package-gui-npm:
extends: extends:
- .build-node - .build-node

View File

@ -4,7 +4,7 @@ onnx_env: ## create virtual env
python -v venv onnx_env python -v venv onnx_env
ci: pip ci: pip
pip install coverage pip install coverage hypothesis unittest
$(MAKE) test $(MAKE) test
pip: pip:
@ -16,6 +16,8 @@ test:
python -m coverage html python -m coverage html
python -m coverage xml python -m coverage xml
package: package-dist package-upload
package-dist: package-dist:
python ./setup.py sdist python ./setup.py sdist

View File

@ -3,7 +3,7 @@
# JS targets # JS targets
node_modules: deps node_modules: deps
ci: deps lint build-shebang test ci: deps lint build-shebang test bundle
clean: clean:
rm -rf node_modules/ rm -rf node_modules/