From b45098a51d6bfcabb9957307e71ab55697deef5d Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 12:59:42 +0530 Subject: [PATCH 1/6] start CI wrt cross platform which include testing in all platforms --- CONTRIBUTORS | 3 ++- docker-compose.sh | 18 +----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 014aa2a80..0ec0b7170 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -16,4 +16,5 @@ ketangupta34 onkardahale Akshit Garg burnerlee -Praveen Kumar \ No newline at end of file +Praveen Kumar +Harsh Rao \ No newline at end of file diff --git a/docker-compose.sh b/docker-compose.sh index 9c075acf8..52312fba9 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -199,24 +199,8 @@ sub_cache() { $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.cache.yml build cli } -# Build MetaCall Docker Compose with multi-platform specifier (link manually dockerignore files) sub_platform() { - if [ -z "$METACALL_PLATFORM" ]; then - echo "Error: METACALL_PLATFORM variable not defined" - exit 1 - fi - - ln -sf tools/deps/.dockerignore .dockerignore - $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.platform.yml build deps - - ln -sf tools/dev/.dockerignore .dockerignore - $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.platform.yml build dev - - ln -sf tools/runtime/.dockerignore .dockerignore - $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.platform.yml build runtime - - ln -sf tools/cli/.dockerignore .dockerignore - $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.platform.yml build cli + } # Push MetaCall Docker Compose From 4931412af76a1451f84c87e214ddc6f7798e86d7 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 13:02:12 +0530 Subject: [PATCH 2/6] Set up Buildx if not already configured --- docker-compose.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker-compose.sh b/docker-compose.sh index 52312fba9..dc2e999cd 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -200,7 +200,18 @@ sub_cache() { } sub_platform() { - + # Default platform if not defined + if [ -z "$METACALL_PLATFORM" ]; then + METACALL_PLATFORM="linux/amd64" + echo "METACALL_PLATFORM not defined. Defaulting to: $METACALL_PLATFORM" + else + echo "Building for platform: $METACALL_PLATFORM" + fi + + # Set up Buildx if not already configured + docker buildx ls | grep multiarch_builder || docker buildx create --name multiarch_builder --use + docker buildx inspect multiarch_builder --bootstrap + } # Push MetaCall Docker Compose From 54276d7377d760f72dbc6735fe6f076c50e3db36 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 13:03:03 +0530 Subject: [PATCH 3/6] build dependencies --- docker-compose.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.sh b/docker-compose.sh index dc2e999cd..e1b75b97e 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -211,6 +211,11 @@ sub_platform() { # Set up Buildx if not already configured docker buildx ls | grep multiarch_builder || docker buildx create --name multiarch_builder --use docker buildx inspect multiarch_builder --bootstrap + + # Build dependencies + ln -sf tools/deps/.dockerignore .dockerignore + docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/deps . + } From d52035e2721ad6de26cae97549e7e09ba529b533 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 13:03:59 +0530 Subject: [PATCH 4/6] build dev environment --- docker-compose.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.sh b/docker-compose.sh index e1b75b97e..068e46d4a 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -216,6 +216,10 @@ sub_platform() { ln -sf tools/deps/.dockerignore .dockerignore docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/deps . + # Build development environment + ln -sf tools/dev/.dockerignore .dockerignore + docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/dev . + } From 3d30fc25956d9288907276bbf0989e93826d5a4e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 13:04:41 +0530 Subject: [PATCH 5/6] build runtime and CLI --- docker-compose.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker-compose.sh b/docker-compose.sh index 068e46d4a..7f3717cbe 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -220,6 +220,14 @@ sub_platform() { ln -sf tools/dev/.dockerignore .dockerignore docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/dev . + # Build runtime + ln -sf tools/runtime/.dockerignore .dockerignore + docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/runtime . + + # Build CLI + ln -sf tools/cli/.dockerignore .dockerignore + docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/cli . + } From f9f2096effaf062804be82f1ff99960678f391ce Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Dec 2024 13:14:02 +0530 Subject: [PATCH 6/6] build runtime and CLI for all platforms --- docker-compose.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.sh b/docker-compose.sh index 7f3717cbe..a1ca1cd0a 100755 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -220,14 +220,15 @@ sub_platform() { ln -sf tools/dev/.dockerignore .dockerignore docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/dev . - # Build runtime + # Build runtime for all platforms ln -sf tools/runtime/.dockerignore .dockerignore docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/runtime . - # Build CLI + # Build CLI for all platforms ln -sf tools/cli/.dockerignore .dockerignore docker buildx build --platform $METACALL_PLATFORM -f docker-compose.yml -t metacall/cli . + echo "Build process complete for platform: $METACALL_PLATFORM" }