Compare commits
2 Commits
arm64-dock
...
243-server
Author | SHA1 | Date | |
---|---|---|---|
7555b1332a | |||
690e450349 |
@ -1,43 +1,13 @@
|
|||||||
stages:
|
stages:
|
||||||
# - test
|
- test
|
||||||
# - build-addon-zip
|
- build
|
||||||
# - build-amd64
|
- deploy
|
||||||
- build-arm64
|
- doc
|
||||||
# - doc
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# include:
|
include:
|
||||||
# # - local: .gitlab/ci/test.gitlab-ci.yml
|
- local: .gitlab/ci/test.gitlab-ci.yml
|
||||||
# # - local: .gitlab/ci/build-addon.gitlab-ci.yml
|
- local: .gitlab/ci/build.gitlab-ci.yml
|
||||||
# - local: .gitlab/ci/build-image.gitlab-ci.yml
|
- local: .gitlab/ci/deploy.gitlab-ci.yml
|
||||||
# # - local: .gitlab/ci/doc.gitlab-ci.yml
|
- local: .gitlab/ci/doc.gitlab-ci.yml
|
||||||
|
|
||||||
build-arm64:
|
|
||||||
stage: build-arm64
|
|
||||||
# needs: ["build-addon-zip"]
|
|
||||||
image: slumber/docker-python
|
|
||||||
variables:
|
|
||||||
DOCKER_DRIVER: overlay2
|
|
||||||
DOCKER_TLS_CERTDIR: "/certs"
|
|
||||||
GIT_SUBMODULE_STRATEGY: recursive
|
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:19.03.12-dind
|
|
||||||
before_script:
|
|
||||||
- apk add curl
|
|
||||||
- mkdir -p ~/.docker/cli-plugins
|
|
||||||
- curl -sSLo ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-amd64
|
|
||||||
- chmod +x ~/.docker/cli-plugins/docker-buildx
|
|
||||||
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
|
|
||||||
- docker info
|
|
||||||
script:
|
|
||||||
- RP_VERSION="$(python scripts/get_replication_version.py)"
|
|
||||||
- VERSION="$(python scripts/get_addon_version.py)"
|
|
||||||
- echo "Building docker image with replication ${RP_VERSION}"
|
|
||||||
- docker buildx create arm64 --use
|
|
||||||
- docker buildx build --platform linux/arm64 --build-arg version={VERSION} --tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 ./scripts/docker_server
|
|
||||||
- echo "Pushing to gitlab registry ${VERSION}-arm64"
|
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
|
||||||
- docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}-arm64
|
|
||||||
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64
|
|
||||||
|
@ -1,50 +0,0 @@
|
|||||||
build-amd64:
|
|
||||||
stage: build-amd64
|
|
||||||
needs: ["build-addon-zip"]
|
|
||||||
image: slumber/docker-python
|
|
||||||
variables:
|
|
||||||
DOCKER_DRIVER: overlay2
|
|
||||||
DOCKER_TLS_CERTDIR: "/certs"
|
|
||||||
GIT_SUBMODULE_STRATEGY: recursive
|
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:19.03.12-dind
|
|
||||||
|
|
||||||
script:
|
|
||||||
- RP_VERSION="$(python scripts/get_replication_version.py)"
|
|
||||||
- VERSION="$(python scripts/get_addon_version.py)"
|
|
||||||
- echo "Building docker image with replication ${RP_VERSION}"
|
|
||||||
- docker build --build-arg replication_version=${RP_VERSION} --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
|
|
||||||
- echo "Pushing to gitlab registry ${VERSION}"
|
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
|
||||||
- docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}
|
|
||||||
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server
|
|
||||||
|
|
||||||
build-arm64:
|
|
||||||
stage: build-arm64
|
|
||||||
# needs: ["build-addon-zip"]
|
|
||||||
image: slumber/docker-python
|
|
||||||
variables:
|
|
||||||
DOCKER_DRIVER: overlay2
|
|
||||||
DOCKER_TLS_CERTDIR: "/certs"
|
|
||||||
GIT_SUBMODULE_STRATEGY: recursive
|
|
||||||
|
|
||||||
services:
|
|
||||||
- docker:19.03.12-dind
|
|
||||||
before_script:
|
|
||||||
- apk add curl
|
|
||||||
- mkdir -p ~/.docker/cli-plugins
|
|
||||||
- curl -sSLo ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-amd64
|
|
||||||
- chmod +x ~/.docker/cli-plugins/docker-buildx
|
|
||||||
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
|
|
||||||
- docker info
|
|
||||||
script:
|
|
||||||
- RP_VERSION="$(python scripts/get_replication_version.py)"
|
|
||||||
- VERSION="$(python scripts/get_addon_version.py)"
|
|
||||||
- echo "Building docker image with replication ${RP_VERSION}"
|
|
||||||
- docker buildx create arm64 --use
|
|
||||||
- docker buildx build --platform linux/arm64 --build-arg version={VERSION} --tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 ./scripts/docker_server
|
|
||||||
- echo "Pushing to gitlab registry ${VERSION}-arm64"
|
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
|
||||||
- docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}-arm64
|
|
||||||
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64
|
|
@ -1,5 +1,5 @@
|
|||||||
build-addon-zip:
|
build:
|
||||||
stage: build-addon-zip
|
stage: build
|
||||||
needs: ["test"]
|
needs: ["test"]
|
||||||
image: debian:stable-slim
|
image: debian:stable-slim
|
||||||
script:
|
script:
|
21
.gitlab/ci/deploy.gitlab-ci.yml
Normal file
21
.gitlab/ci/deploy.gitlab-ci.yml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
deploy:
|
||||||
|
stage: deploy
|
||||||
|
needs: ["build"]
|
||||||
|
image: slumber/docker-python
|
||||||
|
variables:
|
||||||
|
DOCKER_DRIVER: overlay2
|
||||||
|
DOCKER_TLS_CERTDIR: "/certs"
|
||||||
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|
||||||
|
services:
|
||||||
|
- docker:19.03.12-dind
|
||||||
|
|
||||||
|
script:
|
||||||
|
- RP_VERSION="$(python scripts/get_replication_version.py)"
|
||||||
|
- VERSION="$(python scripts/get_addon_version.py)"
|
||||||
|
- echo "Building docker image with replication ${RP_VERSION}"
|
||||||
|
- docker build --build-arg replication_version=${RP_VERSION} --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
|
||||||
|
- echo "Pushing to gitlab registry ${VERSION}"
|
||||||
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
|
- docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}
|
||||||
|
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server
|
@ -1,6 +1,6 @@
|
|||||||
pages:
|
pages:
|
||||||
stage: doc
|
stage: doc
|
||||||
needs: ["build-arm64","build-amd64"]
|
needs: ["deploy"]
|
||||||
image: python
|
image: python
|
||||||
script:
|
script:
|
||||||
- pip install -U sphinx sphinx_rtd_theme sphinx-material
|
- pip install -U sphinx sphinx_rtd_theme sphinx-material
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
bl_info = {
|
bl_info = {
|
||||||
"name": "Multi-User",
|
"name": "Multi-User",
|
||||||
"author": "Swann Martinez",
|
"author": "Swann Martinez",
|
||||||
"version": (0, 4, 0),
|
"version": (0, 4, 1),
|
||||||
"description": "Enable real-time collaborative workflow inside blender",
|
"description": "Enable real-time collaborative workflow inside blender",
|
||||||
"blender": (2, 82, 0),
|
"blender": (2, 82, 0),
|
||||||
"location": "3D View > Sidebar > Multi-User tab",
|
"location": "3D View > Sidebar > Multi-User tab",
|
||||||
|
Submodule multi_user/libs/replication updated: 9aa015bd69...029e12b2be
Reference in New Issue
Block a user