[Komodo] Commit Sync: update release.toml

.gitignore

@@ -0,0 +1 @@
+.DS_Store

builders.toml

@@ -4,11 +4,12 @@ tags = ["builder"]
 [builder.config]
 type = "Aws"
 params.region = "us-east-2"
-params.instance_type = "c7g.2xlarge"
+params.instance_type = "c7g.4xlarge"
 params.ami_id = "ami-06fdde90cf1861127"
 params.subnet_id = "subnet-02ae5ad480eacc4bc"
 params.key_pair_name = "komodo-key"
 params.assign_public_ip = true
+params.use_public_ip = true
 params.security_group_ids = ["sg-0babe545ecfb49c9b"]
 params.user_data = """
 #!/bin/bash
@@ -21,7 +22,7 @@ name = "local"
 tags = ["builder"]
 [builder.config]
 type = "Url"
-params.address = "https://3.132.55.195:8120"
+params.address = "https://178.156.176.15:8120"
 
 ##
 
@@ -31,10 +32,12 @@ tags = ["builder"]
 [builder.config]
 type = "Aws"
 params.region = "us-east-2"
+params.instance_type = "c5.4xlarge"
 params.ami_id = "ami-0364d0950b88ef0e9"
 params.subnet_id = "subnet-02ae5ad480eacc4bc"
 params.key_pair_name = "komodo-key"
 params.assign_public_ip = true
+params.use_public_ip = true
 params.security_group_ids = ["sg-0babe545ecfb49c9b"]
 params.user_data = """
 #!/bin/bash

dev.toml

@@ -3,7 +3,7 @@ name = "komodo-binaries-dev-aarch64"
 tags = ["dev", "binaries", "aarch64"]
 [build.config]
 builder = "aarch64-builder"
-version = "1.17.0"
+version = "1.18.0"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "dev-aarch64"
@@ -11,7 +11,7 @@ links = [
   "https://github.com/moghtech/komodo/pkgs/container/komodo-binaries"
 ]
 repo = "moghtech/komodo"
-branch = "1.17.0"
+branch = "1.18.0"
 dockerfile_path = "bin/binaries.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
@@ -24,7 +24,7 @@ name = "komodo-binaries-dev-x86_64"
 tags = ["dev", "binaries", "x86_64"]
 [build.config]
 builder = "x86_64-builder"
-version = "1.17.0"
+version = "1.18.0"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "dev-x86_64"
@@ -32,7 +32,7 @@ links = [
   "https://github.com/moghtech/komodo/pkgs/container/komodo-binaries"
 ]
 repo = "moghtech/komodo"
-branch = "1.17.0"
+branch = "1.18.0"
 dockerfile_path = "bin/binaries.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
@@ -45,15 +45,15 @@ name = "komodo-core-dev"
 tags = ["dev", "core"]
 [build.config]
 builder = "local"
-version = "1.17.0"
+version = "1.18.0"
 auto_increment_version = false
-image_name = "komodo"
+image_name = "komodo-core"
 image_tag = "dev"
 links = [
-  "https://github.com/moghtech/komodo/pkgs/container/komodo"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-core"
 ]
 repo = "moghtech/komodo"
-branch = "1.17.0"
+branch = "1.18.0"
 dockerfile_path = "bin/core/multi-arch.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
@@ -74,7 +74,7 @@ name = "komodo-frontend-dev"
 tags = ["dev", "frontend"]
 [build.config]
 builder = "local"
-version = "1.17.0"
+version = "1.18.0"
 auto_increment_version = false
 image_name = "komodo-frontend"
 image_tag = "dev"
@@ -82,7 +82,7 @@ links = [
   "https://github.com/moghtech/komodo/pkgs/container/komodo-frontend"
 ]
 repo = "moghtech/komodo"
-branch = "1.17.0"
+branch = "1.18.0"
 dockerfile_path = "frontend/Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
@@ -95,7 +95,7 @@ name = "komodo-periphery-dev"
 tags = ["dev", "periphery"]
 [build.config]
 builder = "local"
-version = "1.17.0"
+version = "1.18.0"
 auto_increment_version = false
 image_name = "komodo-periphery"
 image_tag = "dev"
@@ -103,7 +103,7 @@ links = [
   "https://github.com/moghtech/komodo/pkgs/container/komodo-periphery"
 ]
 repo = "moghtech/komodo"
-branch = "1.17.0"
+branch = "1.18.0"
 dockerfile_path = "bin/periphery/multi-arch.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
@@ -118,6 +118,34 @@ build_args = """
 
 ##
 
+[[build]]
+name = "komodo-util-dev"
+tags = ["dev", "util"]
+[build.config]
+builder = "local"
+version = "1.18.0"
+auto_increment_version = false
+image_name = "komodo-util"
+image_tag = "dev"
+links = [
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-util"
+]
+repo = "moghtech/komodo"
+branch = "1.18.0"
+dockerfile_path = "bin/util/multi-arch.Dockerfile"
+image_registry.domain = "ghcr.io"
+image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
+extra_args = [
+  "--platform linux/amd64,linux/arm64",
+  "--builder builder"
+]
+build_args = """
+  BINARIES_IMAGE = ghcr.io/moghtech/komodo-binaries:latest-dev
+"""
+
+##
+
 [[repo]]
 name = "upload-binaries-dev"
 tags = ["dev", "binaries"]
@@ -154,6 +182,7 @@ enabled = true
 executions = [
   { execution.type = "RunBuild", execution.params.build = "komodo-core-dev", enabled = true },
   { execution.type = "RunBuild", execution.params.build = "komodo-periphery-dev", enabled = true },
+  { execution.type = "RunBuild", execution.params.build = "komodo-util-dev", enabled = true },
   { execution.type = "BuildRepo", execution.params.repo = "upload-binaries-dev", enabled = true }
 ]
 
@@ -164,9 +193,9 @@ name = "publish-dev"
 tags = ["dev"]
 [action.config]
 file_contents = """
-const BRANCH = "1.17.0";
-const VERSION = "1.17.0";
-const TAG = "dev-5";
+const BRANCH = "1.18.0";
+const VERSION = "1.18.0";
+const TAG = "dev-1";
 
 await komodo.write("UpdateVariableValue", {
   name: "KOMODO_DEV_VERSION",
@@ -204,7 +233,7 @@ name = "dev"
 tags = ["dev"]
 [resource_sync.config]
 git_provider = "git.komo.do"
-repo = "moghtech/build"
+repo = "komodo/build"
 git_account = "mbecker20"
 resource_path = ["dev.toml"]
 managed = true

komodo-build.code-workspace

@@ -1,8 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {}
-}

release.toml

@@ -3,7 +3,7 @@ name = "komodo-binaries-aarch64"
 tags = ["release", "binaries", "aarch64"]
 [build.config]
 builder = "aarch64-builder"
-version = "1.17.0"
+version = "1.18.4"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "aarch64"
@@ -20,7 +20,7 @@ name = "komodo-binaries-x86_64"
 tags = ["release", "binaries", "x86_64"]
 [build.config]
 builder = "x86_64-builder"
-version = "1.17.0"
+version = "1.18.4"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "x86_64"
@@ -43,9 +43,8 @@ Must run the following command on host to create the builder:
 tags = ["release", "core"]
 [build.config]
 builder = "local"
-version = "1.17.0"
+version = "1.18.4"
 auto_increment_version = false
-image_name = "komodo"
 repo = "moghtech/komodo"
 dockerfile_path = "bin/core/multi-arch.Dockerfile"
 image_registry.domain = "ghcr.io"
@@ -63,7 +62,7 @@ name = "komodo-frontend"
 tags = ["release", "frontend"]
 [build.config]
 builder = "x86_64-builder"
-version = "1.17.0"
+version = "1.18.4"
 auto_increment_version = false
 repo = "moghtech/komodo"
 dockerfile_path = "frontend/Dockerfile"
@@ -84,7 +83,7 @@ Must run the following command to create the builder:
 tags = ["release", "periphery"]
 [build.config]
 builder = "local"
-version = "1.17.0"
+version = "1.18.4"
 auto_increment_version = false
 repo = "moghtech/komodo"
 dockerfile_path = "bin/periphery/multi-arch.Dockerfile"
@@ -98,6 +97,28 @@ extra_args = [
 
 ##
 
+[[build]]
+name = "komodo-util"
+tags = ["release", "util"]
+[build.config]
+builder = "local"
+version = "1.18.4"
+auto_increment_version = false
+links = [
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-util"
+]
+repo = "moghtech/komodo"
+dockerfile_path = "bin/util/multi-arch.Dockerfile"
+image_registry.domain = "ghcr.io"
+image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
+extra_args = [
+  "--platform linux/amd64,linux/arm64",
+  "--builder builder"
+]
+
+##
+
 [[repo]]
 name = "upload-binaries"
 tags = ["release", "binaries"]
@@ -134,61 +155,48 @@ enabled = true
 executions = [
   { execution.type = "RunBuild", execution.params.build = "komodo-core", enabled = true },
   { execution.type = "RunBuild", execution.params.build = "komodo-periphery", enabled = true },
+  { execution.type = "RunBuild", execution.params.build = "komodo-util", enabled = true },
   { execution.type = "BuildRepo", execution.params.repo = "upload-binaries", enabled = true }
 ]
 
 ##
 
 [[action]]
-name = "publish_release"
+name = "publish-release"
 tags = ["release"]
 [action.config]
 file_contents = """
-const KOMODO_VERSION = "1.16.11";
-const APPS = ["core", "periphery"];
-const ARCHS = ["x86", "aarch64"];
+const BRANCH = "main";
+const VERSION = "1.18.4";
+const TAG = "release-1";
 
-const last_version = (
-  await komodo.read("GetVariable", { name: "KOMODO_VERSION" })
-).value;
-
-// Update Variable
 await komodo.write("UpdateVariableValue", {
-  name: "KOMODO_VERSION",
-  value: KOMODO_VERSION,
+  name: "KOMODO_RELEASE_VERSION",
+  value: VERSION,
 });
-console.log("Updated KOMODO_VERSION to " + KOMODO_VERSION);
+console.log("Updated KOMODO_RELEASE_VERSION to", VERSION);
 
-// Update Builds
-for (const app of APPS) {
-  for (const arch of ARCHS) {
-    const name = `komodo-${app}-${arch}`;
-    await komodo.write("UpdateBuild", {
-      id: name,
-      config: {
-        version: KOMODO_VERSION as any,
-      },
-    });
-    console.log(`Updated Build ${name} to ${KOMODO_VERSION}`);
-  }
+await komodo.write("UpdateVariableValue", {
+  name: "KOMODO_RELEASE_TAG",
+  value: TAG,
+});
+console.log("Updated KOMODO_RELEASE_TAG to", TAG);
+
+const builds = await komodo.read("ListBuilds", { query: { tags: ["release"] } });
+
+for (const build of builds) {
+  await komodo.write("UpdateBuild", {
+    id: build.id,
+    config: { version: VERSION as any, branch: BRANCH },
+  });
+  console.log("Updated", build.name);
 }
 
-// Update 'release' Sync references
-const sync = await komodo.read("GetResourceSync", { sync: "release" });
-const file = sync.info?.remote_contents?.find(
-  (file) => file.path === "release.toml",
-);
-await komodo.write("WriteSyncFileContents", {
-  sync: "release",
-  resource_path: file.resource_path,
-  file_path: file.path,
-  contents: file.contents.replaceAll(last_version, KOMODO_VERSION),
-});
-console.log(`Updated Sync references to ${KOMODO_VERSION}`);
+await komodo.write("CommitSync", { sync: "release" });
+console.log("Committed changes to 'release' Sync");
 
-// Start the procedure run.
-await komodo.execute("RunProcedure", { procedure: "build_release" });
-console.log("Publish Procedure triggered ✅");
+await komodo.execute("RunProcedure", { procedure: "build-release" });
+console.log("Launched 'build-release' Procedure");
 """
 
 ##

upload-binaries.sh

@@ -22,15 +22,36 @@ docker pull $AARCH64_IMAGE
 x86_64_id=$(docker create $X86_64_IMAGE sh)
 aarch64_id=$(docker create $AARCH64_IMAGE sh)
 
-docker cp $x86_64_id:/periphery ./periphery-x86_64
-docker cp $aarch64_id:/periphery ./periphery-aarch64
 
+## CORE
+docker cp $x86_64_id:/core ./core-x86_64
+curl --user mbecker20:$KOMODO_GIT_TOKEN \
+    --upload-file ./core-x86_64 \
+    https://git.komo.do/api/packages/komodo/generic/core/$KOMODO_VERSION-$TAG/core-x86_64
+docker cp $aarch64_id:/core ./core-aarch64
+curl --user mbecker20:$KOMODO_GIT_TOKEN \
+    --upload-file ./core-aarch64 \
+    https://git.komo.do/api/packages/komodo/generic/core/$KOMODO_VERSION-$TAG/core-aarch64
+
+## PERIPHERY
+docker cp $x86_64_id:/periphery ./periphery-x86_64
 curl --user mbecker20:$KOMODO_GIT_TOKEN \
     --upload-file ./periphery-x86_64 \
-    https://git.komo.do/api/packages/moghtech/generic/periphery/$KOMODO_VERSION-$TAG/periphery-x86_64
+    https://git.komo.do/api/packages/komodo/generic/periphery/$KOMODO_VERSION-$TAG/periphery-x86_64
+docker cp $aarch64_id:/periphery ./periphery-aarch64
 curl --user mbecker20:$KOMODO_GIT_TOKEN \
     --upload-file ./periphery-aarch64 \
-    https://git.komo.do/api/packages/moghtech/generic/periphery/$KOMODO_VERSION-$TAG/periphery-aarch64
+    https://git.komo.do/api/packages/komodo/generic/periphery/$KOMODO_VERSION-$TAG/periphery-aarch64
+
+## UTIL
+docker cp $x86_64_id:/util ./util-x86_64
+curl --user mbecker20:$KOMODO_GIT_TOKEN \
+    --upload-file ./util-x86_64 \
+    https://git.komo.do/api/packages/komodo/generic/util/$KOMODO_VERSION-$TAG/util-x86_64
+docker cp $aarch64_id:/util ./util-aarch64
+curl --user mbecker20:$KOMODO_GIT_TOKEN \
+    --upload-file ./util-aarch64 \
+    https://git.komo.do/api/packages/komodo/generic/util/$KOMODO_VERSION-$TAG/util-aarch64
 
 docker container rm $x86_64_id
 docker container rm $aarch64_id