From 7dcb9ce325c153a6adb9475c68cd80d3fd649877 Mon Sep 17 00:00:00 2001 From: alfred-openmined-bot <145415986+alfred-openmined-bot@users.noreply.github.com> Date: Tue, 23 Jul 2024 05:16:35 +0000 Subject: [PATCH 01/12] [syft]bump version --- .bumpversion.cfg | 2 +- VERSION | 2 +- packages/grid/VERSION | 2 +- .../backend/grid/images/worker_cpu.dockerfile | 2 +- packages/grid/devspace.yaml | 2 +- packages/grid/frontend/package.json | 2 +- packages/grid/helm/repo/index.yaml | 199 ++++++++++-------- packages/grid/helm/repo/syft-0.8.8-beta.2.tgz | Bin 0 -> 9977 bytes packages/grid/helm/syft/Chart.yaml | 4 +- packages/grid/helm/syft/values.yaml | 2 +- packages/syft/setup.cfg | 2 +- packages/syft/src/syft/VERSION | 2 +- packages/syft/src/syft/__init__.py | 2 +- packages/syftcli/manifest.yml | 8 +- 14 files changed, 122 insertions(+), 109 deletions(-) create mode 100644 packages/grid/helm/repo/syft-0.8.8-beta.2.tgz diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2ac552c2537..cc664a69ad6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.8-beta.1 +current_version = 0.8.8-beta.2 tag = False tag_name = {new_version} commit = True diff --git a/VERSION b/VERSION index 8742f2ae357..ab18b3a5a42 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.8-beta.1" +__version__ = "0.8.8-beta.2" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/VERSION b/packages/grid/VERSION index 8742f2ae357..ab18b3a5a42 100644 --- a/packages/grid/VERSION +++ b/packages/grid/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.8-beta.1" +__version__ = "0.8.8-beta.2" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/backend/grid/images/worker_cpu.dockerfile b/packages/grid/backend/grid/images/worker_cpu.dockerfile index ce0ed514280..e8021670dde 100644 --- a/packages/grid/backend/grid/images/worker_cpu.dockerfile +++ b/packages/grid/backend/grid/images/worker_cpu.dockerfile @@ -5,7 +5,7 @@ # NOTE: This dockerfile will be built inside a syft-backend container in PROD # Hence COPY will not work the same way in DEV vs. PROD -ARG SYFT_VERSION_TAG="0.8.8-beta.1" +ARG SYFT_VERSION_TAG="0.8.8-beta.2" FROM openmined/syft-backend:${SYFT_VERSION_TAG} # should match base image python version diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml index 07985f06baa..d2a2d975188 100644 --- a/packages/grid/devspace.yaml +++ b/packages/grid/devspace.yaml @@ -28,7 +28,7 @@ vars: DOCKER_IMAGE_RATHOLE: openmined/syft-rathole DOCKER_IMAGE_ENCLAVE_ATTESTATION: openmined/syft-enclave-attestation CONTAINER_REGISTRY: "docker.io" - VERSION: "0.8.8-beta.1" + VERSION: "0.8.8-beta.2" PLATFORM: $(uname -m | grep -q 'arm64' && echo "arm64" || echo "amd64") # This is a list of `images` that DevSpace can build for this project diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json index 06a5c96b4a7..8ffa52384fc 100644 --- a/packages/grid/frontend/package.json +++ b/packages/grid/frontend/package.json @@ -1,6 +1,6 @@ { "name": "syft-ui", - "version": "0.8.8-beta.1", + "version": "0.8.8-beta.2", "private": true, "scripts": { "dev": "pnpm i && vite dev --host --port 80", diff --git a/packages/grid/helm/repo/index.yaml b/packages/grid/helm/repo/index.yaml index fcedb66dbeb..60025378a47 100644 --- a/packages/grid/helm/repo/index.yaml +++ b/packages/grid/helm/repo/index.yaml @@ -1,9 +1,22 @@ apiVersion: v1 entries: syft: + - apiVersion: v2 + appVersion: 0.8.8-beta.2 + created: "2024-07-23T05:14:36.304021154Z" + description: Perform numpy-like analysis on data that remains in someone elses + server + digest: 1323f4082c65944b522cd8e36dc7285c83c7dfcf6a56f7962665a8b1256a4d09 + home: https://github.com/OpenMined/PySyft/ + icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png + name: syft + type: application + urls: + - https://openmined.github.io/PySyft/helm/syft-0.8.8-beta.2.tgz + version: 0.8.8-beta.2 - apiVersion: v2 appVersion: 0.8.8-beta.1 - created: "2024-07-19T14:56:58.347810182Z" + created: "2024-07-23T05:14:36.303032417Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: ec027b50b8182ef656be14ddca9537785c37712a4be8cb940f30ac029b63de2d @@ -16,7 +29,7 @@ entries: version: 0.8.8-beta.1 - apiVersion: v2 appVersion: 0.8.7 - created: "2024-07-19T14:56:58.3470709Z" + created: "2024-07-23T05:14:36.302279109Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 7ea7f63d1c6d0948860547f8aa39343fc5ef399c8e62d9d7edd4473cf44d8186 @@ -29,7 +42,7 @@ entries: version: 0.8.7 - apiVersion: v2 appVersion: 0.8.7-beta.16 - created: "2024-07-19T14:56:58.340216525Z" + created: "2024-07-23T05:14:36.295290269Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 75190eae57b64c2c47ab4a7fe3c6e94f35eb8045807a843ec8d7b26585c9e840 @@ -42,7 +55,7 @@ entries: version: 0.8.7-beta.16 - apiVersion: v2 appVersion: 0.8.7-beta.15 - created: "2024-07-19T14:56:58.339374411Z" + created: "2024-07-23T05:14:36.294389015Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 56879d9a9f10febce88676d3d20621d74d17f9e33f5df6ae1e9bc3078c216f0c @@ -55,7 +68,7 @@ entries: version: 0.8.7-beta.15 - apiVersion: v2 appVersion: 0.8.7-beta.14 - created: "2024-07-19T14:56:58.338523221Z" + created: "2024-07-23T05:14:36.292741363Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 6e7cbca1d603ba11e09ae2a3089cfdafaa08cfa07c553c4f0fb8b42f8d3028f7 @@ -68,7 +81,7 @@ entries: version: 0.8.7-beta.14 - apiVersion: v2 appVersion: 0.8.7-beta.13 - created: "2024-07-19T14:56:58.337608702Z" + created: "2024-07-23T05:14:36.291821233Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 1dbe3ecdfec57bf25020cbcff783fab908f0eb0640ad684470b2fd1da1928005 @@ -81,7 +94,7 @@ entries: version: 0.8.7-beta.13 - apiVersion: v2 appVersion: 0.8.7-beta.12 - created: "2024-07-19T14:56:58.335962013Z" + created: "2024-07-23T05:14:36.291098433Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: e92b2f3a522dabb3a79ff762a7042ae16d2bf3a53eebbb2885a69b9f834d109c @@ -94,7 +107,7 @@ entries: version: 0.8.7-beta.12 - apiVersion: v2 appVersion: 0.8.7-beta.11 - created: "2024-07-19T14:56:58.335262055Z" + created: "2024-07-23T05:14:36.290385871Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 099f6cbd44b699ee2410a4be012ed1a8a65bcacb06a43057b2779d7fe34fc0ad @@ -107,7 +120,7 @@ entries: version: 0.8.7-beta.11 - apiVersion: v2 appVersion: 0.8.7-beta.10 - created: "2024-07-19T14:56:58.334556426Z" + created: "2024-07-23T05:14:36.289673661Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 00773cb241522e281c1915339fc362e047650e08958a736e93d6539f44cb5e25 @@ -120,7 +133,7 @@ entries: version: 0.8.7-beta.10 - apiVersion: v2 appVersion: 0.8.7-beta.9 - created: "2024-07-19T14:56:58.346189183Z" + created: "2024-07-23T05:14:36.300571596Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: a3f8e85d9ddef7a644b959fcc2fcb0fc08f7b6abae1045e893d0d62fa4ae132e @@ -133,7 +146,7 @@ entries: version: 0.8.7-beta.9 - apiVersion: v2 appVersion: 0.8.7-beta.8 - created: "2024-07-19T14:56:58.345525713Z" + created: "2024-07-23T05:14:36.299856881Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: a422ac88d8fd1fb80d5004d5eb6e95fa9efc7f6a87da12e5ac04829da7f04c4d @@ -146,7 +159,7 @@ entries: version: 0.8.7-beta.8 - apiVersion: v2 appVersion: 0.8.7-beta.7 - created: "2024-07-19T14:56:58.344835814Z" + created: "2024-07-23T05:14:36.2991927Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 0dc313a1092e6256a7c8aad002c8ec380b3add2c289d680db1e238a336399b7a @@ -159,7 +172,7 @@ entries: version: 0.8.7-beta.7 - apiVersion: v2 appVersion: 0.8.7-beta.6 - created: "2024-07-19T14:56:58.343389133Z" + created: "2024-07-23T05:14:36.298549398Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 052a2ec1102d2a4c9915f95647abd4a6012f56fa05a106f4952ee9b55bf7bae8 @@ -172,7 +185,7 @@ entries: version: 0.8.7-beta.6 - apiVersion: v2 appVersion: 0.8.7-beta.5 - created: "2024-07-19T14:56:58.342754858Z" + created: "2024-07-23T05:14:36.297898482Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 1728af756907c3fcbe87c2fd2de014a2d963c22a4c2eb6af6596b525a9b9a18a @@ -185,7 +198,7 @@ entries: version: 0.8.7-beta.5 - apiVersion: v2 appVersion: 0.8.7-beta.4 - created: "2024-07-19T14:56:58.342126354Z" + created: "2024-07-23T05:14:36.29724456Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 387a57a3904a05ed61e92ee48605ef6fd5044ff7e822e0924e0d4c485e2c88d2 @@ -198,7 +211,7 @@ entries: version: 0.8.7-beta.4 - apiVersion: v2 appVersion: 0.8.7-beta.3 - created: "2024-07-19T14:56:58.341496597Z" + created: "2024-07-23T05:14:36.296590688Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 3668002b7a4118516b2ecd61d6275f60d83fc12841587ab8f62e1c1200731c67 @@ -211,7 +224,7 @@ entries: version: 0.8.7-beta.3 - apiVersion: v2 appVersion: 0.8.7-beta.2 - created: "2024-07-19T14:56:58.340854798Z" + created: "2024-07-23T05:14:36.295906961Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: e62217ffcadee2b8896ab0543f9ccc42f2df898fd979438ac9376d780b802af7 @@ -224,7 +237,7 @@ entries: version: 0.8.7-beta.2 - apiVersion: v2 appVersion: 0.8.7-beta.1 - created: "2024-07-19T14:56:58.333860827Z" + created: "2024-07-23T05:14:36.288984162Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 553981fe1d5c980e6903b3ff2f1b9b97431f6dd8aee91e3976bcc5594285235e @@ -237,7 +250,7 @@ entries: version: 0.8.7-beta.1 - apiVersion: v2 appVersion: 0.8.6 - created: "2024-07-19T14:56:58.333318874Z" + created: "2024-07-23T05:14:36.288449223Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: ddbbe6fea1702e57404875eb3019a3b1a341017bdbb5fbc6ce418507e5c15756 @@ -250,7 +263,7 @@ entries: version: 0.8.6 - apiVersion: v2 appVersion: 0.8.6-beta.1 - created: "2024-07-19T14:56:58.332765961Z" + created: "2024-07-23T05:14:36.287851767Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: cc2c81ef6796ac853dce256e6bf8a6af966c21803e6534ea21920af681c62e61 @@ -263,7 +276,7 @@ entries: version: 0.8.6-beta.1 - apiVersion: v2 appVersion: 0.8.5 - created: "2024-07-19T14:56:58.332190095Z" + created: "2024-07-23T05:14:36.287249832Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: db5d90d44006209fd5ecdebd88f5fd56c70f7c76898343719a0ff8da46da948a @@ -276,7 +289,7 @@ entries: version: 0.8.5 - apiVersion: v2 appVersion: 0.8.5-post.2 - created: "2024-07-19T14:56:58.331422871Z" + created: "2024-07-23T05:14:36.286450138Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: ea3f7269b55f773fa165d7008c054b7cf3ec4c62eb40a96f08cd3a9b77fd2165 @@ -289,7 +302,7 @@ entries: version: 0.8.5-post.2 - apiVersion: v2 appVersion: 0.8.5-post.1 - created: "2024-07-19T14:56:58.330873344Z" + created: "2024-07-23T05:14:36.28525945Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 9deb844d3dc2d8480c60f8c631dcc7794adfb39cec3aa3b1ce22ea26fdf87d02 @@ -302,7 +315,7 @@ entries: version: 0.8.5-post.1 - apiVersion: v2 appVersion: 0.8.5-beta.10 - created: "2024-07-19T14:56:58.32280441Z" + created: "2024-07-23T05:14:36.277953038Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 9cfe01e8f57eca462261a24a805b41509be2de9a0fee76e331d124ed98c4bc49 @@ -315,7 +328,7 @@ entries: version: 0.8.5-beta.10 - apiVersion: v2 appVersion: 0.8.5-beta.9 - created: "2024-07-19T14:56:58.330065615Z" + created: "2024-07-23T05:14:36.284257708Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 057f1733f2bc966e15618f62629315c8207773ef6211c79c4feb557dae15c32b @@ -328,7 +341,7 @@ entries: version: 0.8.5-beta.9 - apiVersion: v2 appVersion: 0.8.5-beta.8 - created: "2024-07-19T14:56:58.328428308Z" + created: "2024-07-23T05:14:36.283487649Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 921cbce836c3032ef62b48cc82b5b4fcbe44fb81d473cf4d69a4bf0f806eb298 @@ -341,7 +354,7 @@ entries: version: 0.8.5-beta.8 - apiVersion: v2 appVersion: 0.8.5-beta.7 - created: "2024-07-19T14:56:58.327665092Z" + created: "2024-07-23T05:14:36.282714625Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 75482e955b2b9853a80bd653afb1d56535f78f3bfb7726798522307eb3effbbd @@ -354,7 +367,7 @@ entries: version: 0.8.5-beta.7 - apiVersion: v2 appVersion: 0.8.5-beta.6 - created: "2024-07-19T14:56:58.326895754Z" + created: "2024-07-23T05:14:36.281914209Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 6a2dfaf65ca855e1b3d7b966d4ff291e6fcbe761e2fc2a78033211ccd3a75de0 @@ -367,7 +380,7 @@ entries: version: 0.8.5-beta.6 - apiVersion: v2 appVersion: 0.8.5-beta.5 - created: "2024-07-19T14:56:58.32611216Z" + created: "2024-07-23T05:14:36.281139492Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: fead03823bef04d66901d563aa755c68ab277f72b126aaa6f0dce76a6f3bdb6d @@ -380,7 +393,7 @@ entries: version: 0.8.5-beta.5 - apiVersion: v2 appVersion: 0.8.5-beta.4 - created: "2024-07-19T14:56:58.325326592Z" + created: "2024-07-23T05:14:36.280323076Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 93e4539d5726a7fd0d6a3e93d1c17c6a358a923ddc01d102eab22f37377502ab @@ -393,7 +406,7 @@ entries: version: 0.8.5-beta.4 - apiVersion: v2 appVersion: 0.8.5-beta.3 - created: "2024-07-19T14:56:58.324515387Z" + created: "2024-07-23T05:14:36.279538871Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: f91e9390edf3441469048f5da646099af98f8b6d199409d0e2c1e6da3a51f054 @@ -406,7 +419,7 @@ entries: version: 0.8.5-beta.3 - apiVersion: v2 appVersion: 0.8.5-beta.2 - created: "2024-07-19T14:56:58.323742512Z" + created: "2024-07-23T05:14:36.278753464Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 59159c3aa4888038edc3c0135c83402363d7a0639fe62966a1e9d4928a364fa8 @@ -419,7 +432,7 @@ entries: version: 0.8.5-beta.2 - apiVersion: v2 appVersion: 0.8.5-beta.1 - created: "2024-07-19T14:56:58.321207396Z" + created: "2024-07-23T05:14:36.276332471Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 65aeb74c52ed8ba5474af500b4c1188a570ee4cb1f2a2da356b3488d28356ed9 @@ -431,7 +444,7 @@ entries: version: 0.8.5-beta.1 - apiVersion: v2 appVersion: 0.8.4 - created: "2024-07-19T14:56:58.320815093Z" + created: "2024-07-23T05:14:36.275940849Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 08afea8e3a9eef225b7e611f0bc1216c140053ef8e51439b02337faeac621fd0 @@ -443,7 +456,7 @@ entries: version: 0.8.4 - apiVersion: v2 appVersion: 0.8.4-beta.31 - created: "2024-07-19T14:56:58.318335309Z" + created: "2024-07-23T05:14:36.27339937Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: fabf3e2f37e53fa623f5d3d99b00feae06e278e5cd63bce419089946312ab1fc @@ -455,7 +468,7 @@ entries: version: 0.8.4-beta.31 - apiVersion: v2 appVersion: 0.8.4-beta.30 - created: "2024-07-19T14:56:58.317920574Z" + created: "2024-07-23T05:14:36.272967053Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 6e8f792709f73ec14eab48a268bdf50a4505b340bd142cddd7c7bfffd94009ad @@ -467,7 +480,7 @@ entries: version: 0.8.4-beta.30 - apiVersion: v2 appVersion: 0.8.4-beta.29 - created: "2024-07-19T14:56:58.317145135Z" + created: "2024-07-23T05:14:36.2721201Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 4c985d6a9b3456769c4013f9e85e7374c0f963d2d27627e61f914f5537de1971 @@ -479,7 +492,7 @@ entries: version: 0.8.4-beta.29 - apiVersion: v2 appVersion: 0.8.4-beta.28 - created: "2024-07-19T14:56:58.316677401Z" + created: "2024-07-23T05:14:36.271647287Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: bd2aa3c92c768c47c502e31a326f341addcb34e64d22cdcbf5cc3f19689d859c @@ -491,7 +504,7 @@ entries: version: 0.8.4-beta.28 - apiVersion: v2 appVersion: 0.8.4-beta.27 - created: "2024-07-19T14:56:58.316246256Z" + created: "2024-07-23T05:14:36.271206944Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: e8ad0869993af39d7adda8cb868dc0b24cfb63b4bb9820dc579939c1007a60ba @@ -503,7 +516,7 @@ entries: version: 0.8.4-beta.27 - apiVersion: v2 appVersion: 0.8.4-beta.26 - created: "2024-07-19T14:56:58.315611849Z" + created: "2024-07-23T05:14:36.270740362Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 30dccf630aa25a86a03c67572fe5411687d8ce6d58def448ea10efdba2b85e3a @@ -515,7 +528,7 @@ entries: version: 0.8.4-beta.26 - apiVersion: v2 appVersion: 0.8.4-beta.25 - created: "2024-07-19T14:56:58.31464389Z" + created: "2024-07-23T05:14:36.26998706Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: b6e2043bcf5a0335967d770c7939f5a7832955359a7d871c90b265660ff26e5f @@ -527,7 +540,7 @@ entries: version: 0.8.4-beta.25 - apiVersion: v2 appVersion: 0.8.4-beta.24 - created: "2024-07-19T14:56:58.314227853Z" + created: "2024-07-23T05:14:36.269104681Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: b19efa95394d50bb8d76da6ec306de5d3bb9ea55371fafea95a1282a697fa33e @@ -539,7 +552,7 @@ entries: version: 0.8.4-beta.24 - apiVersion: v2 appVersion: 0.8.4-beta.23 - created: "2024-07-19T14:56:58.313802949Z" + created: "2024-07-23T05:14:36.268666643Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 5c5d05c15bff548574896118ce92335ae10c5b78f5307fe9b2618e5a5aa71a5c @@ -551,7 +564,7 @@ entries: version: 0.8.4-beta.23 - apiVersion: v2 appVersion: 0.8.4-beta.22 - created: "2024-07-19T14:56:58.313369619Z" + created: "2024-07-23T05:14:36.268169073Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 0160dbce938198132ca9cd2a5cb362816344687291f5b6d7cf6de8f2855e9414 @@ -563,7 +576,7 @@ entries: version: 0.8.4-beta.22 - apiVersion: v2 appVersion: 0.8.4-beta.21 - created: "2024-07-19T14:56:58.312919969Z" + created: "2024-07-23T05:14:36.267738479Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 7dce153d2fcae7513e9c132e139b2721fd975ea3cc43a370e34dbeb2a1b7f683 @@ -575,7 +588,7 @@ entries: version: 0.8.4-beta.21 - apiVersion: v2 appVersion: 0.8.4-beta.20 - created: "2024-07-19T14:56:58.312464337Z" + created: "2024-07-23T05:14:36.26726834Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: c51189a187bbf24135382e25cb00964e0330dfcd3b2f0c884581a6686f05dd28 @@ -587,7 +600,7 @@ entries: version: 0.8.4-beta.20 - apiVersion: v2 appVersion: 0.8.4-beta.19 - created: "2024-07-19T14:56:58.311437449Z" + created: "2024-07-23T05:14:36.266230071Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 8219575dedb42fa2ddbf2768a4e9afbfacbc2dff7e953d77c7b10a41b78dc687 @@ -599,7 +612,7 @@ entries: version: 0.8.4-beta.19 - apiVersion: v2 appVersion: 0.8.4-beta.18 - created: "2024-07-19T14:56:58.311028264Z" + created: "2024-07-23T05:14:36.265819644Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 6418cde559cf12f1f7fea5a2b123bba950e50eeb3be002441827d2ab7f9e4ef7 @@ -611,7 +624,7 @@ entries: version: 0.8.4-beta.18 - apiVersion: v2 appVersion: 0.8.4-beta.16 - created: "2024-07-19T14:56:58.310617857Z" + created: "2024-07-23T05:14:36.265404308Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 9c9840a7c9476dbb08e0ac83926330718fe50c89879752dd8f92712b036109c0 @@ -623,7 +636,7 @@ entries: version: 0.8.4-beta.16 - apiVersion: v2 appVersion: 0.8.4-beta.15 - created: "2024-07-19T14:56:58.310207801Z" + created: "2024-07-23T05:14:36.264966971Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 0955fd22da028315e30c68132cbfa4bdc82bae622039bcfce0de339707bb82eb @@ -635,7 +648,7 @@ entries: version: 0.8.4-beta.15 - apiVersion: v2 appVersion: 0.8.4-beta.14 - created: "2024-07-19T14:56:58.309788287Z" + created: "2024-07-23T05:14:36.26453282Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 56208571956abe20ed7a5cc1867cab2667ed792c63e53d0e8bb70a9b438b7bf6 @@ -647,7 +660,7 @@ entries: version: 0.8.4-beta.14 - apiVersion: v2 appVersion: 0.8.4-beta.13 - created: "2024-07-19T14:56:58.309401124Z" + created: "2024-07-23T05:14:36.264127202Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: d7222c72412b6ee5833fbb07d2549be179cdfc7ccd89e0ad947d112fce799b83 @@ -659,7 +672,7 @@ entries: version: 0.8.4-beta.13 - apiVersion: v2 appVersion: 0.8.4-beta.12 - created: "2024-07-19T14:56:58.30884261Z" + created: "2024-07-23T05:14:36.263750278Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: af08c723756e397962b2d5190dedfd50797b771c5caf58b93a6f65d8fa24785c @@ -671,7 +684,7 @@ entries: version: 0.8.4-beta.12 - apiVersion: v2 appVersion: 0.8.4-beta.11 - created: "2024-07-19T14:56:58.307847643Z" + created: "2024-07-23T05:14:36.263139727Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: a0235835ba57d185a83dd8a26281fa37b2077c3a37fe3a1c50585005695927e3 @@ -683,7 +696,7 @@ entries: version: 0.8.4-beta.11 - apiVersion: v2 appVersion: 0.8.4-beta.10 - created: "2024-07-19T14:56:58.307492028Z" + created: "2024-07-23T05:14:36.262408881Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 910ddfeba0c5e66651500dd11404afff092adc0f768ed68e0d93b04b83aa4388 @@ -695,7 +708,7 @@ entries: version: 0.8.4-beta.10 - apiVersion: v2 appVersion: 0.8.4-beta.9 - created: "2024-07-19T14:56:58.320372255Z" + created: "2024-07-23T05:14:36.275516185Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: c25ca8a9f072d6a5d02232448deaef5668aca05f24dfffbba3ebe30a4f75bb26 @@ -707,7 +720,7 @@ entries: version: 0.8.4-beta.9 - apiVersion: v2 appVersion: 0.8.4-beta.8 - created: "2024-07-19T14:56:58.320034174Z" + created: "2024-07-23T05:14:36.275172644Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 7249a39d4137e457b369384ba0a365c271c780d93a8327ce25083df763c39999 @@ -719,7 +732,7 @@ entries: version: 0.8.4-beta.8 - apiVersion: v2 appVersion: 0.8.4-beta.7 - created: "2024-07-19T14:56:58.319694469Z" + created: "2024-07-23T05:14:36.274815416Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: ee750c7c8d6ea05bd447375e624fdd7f66dd87680ab81f7b7e73df7379a9024a @@ -731,7 +744,7 @@ entries: version: 0.8.4-beta.7 - apiVersion: v2 appVersion: 0.8.4-beta.6 - created: "2024-07-19T14:56:58.319357309Z" + created: "2024-07-23T05:14:36.274467296Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 0e046be9f73df7444a995608c59af16fab9030b139b2acb4d6db6185b8eb5337 @@ -743,7 +756,7 @@ entries: version: 0.8.4-beta.6 - apiVersion: v2 appVersion: 0.8.4-beta.5 - created: "2024-07-19T14:56:58.319019878Z" + created: "2024-07-23T05:14:36.274114096Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: b56e9a23d46810eccdb4cf5272cc05126da3f6db314e541959c3efb5f260620b @@ -755,7 +768,7 @@ entries: version: 0.8.4-beta.5 - apiVersion: v2 appVersion: 0.8.4-beta.4 - created: "2024-07-19T14:56:58.318679462Z" + created: "2024-07-23T05:14:36.27375263Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: 1d5808ecaf55391f3b27ae6236400066508acbd242e33db24a1ab4bffa77409e @@ -767,7 +780,7 @@ entries: version: 0.8.4-beta.4 - apiVersion: v2 appVersion: 0.8.4-beta.3 - created: "2024-07-19T14:56:58.317502693Z" + created: "2024-07-23T05:14:36.272534705Z" description: Perform numpy-like analysis on data that remains in someone elses server digest: b64efa8529d82be56c6ab60487ed24420a5614d96d2509c1f93c1003eda71a54 @@ -779,7 +792,7 @@ entries: version: 0.8.4-beta.3 - apiVersion: v2 appVersion: 0.8.4-beta.2 - created: "2024-07-19T14:56:58.312032441Z" + created: "2024-07-23T05:14:36.266837596Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -795,7 +808,7 @@ entries: version: 0.8.4-beta.2 - apiVersion: v2 appVersion: 0.8.4-beta.1 - created: "2024-07-19T14:56:58.307135381Z" + created: "2024-07-23T05:14:36.261815843Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -811,7 +824,7 @@ entries: version: 0.8.4-beta.1 - apiVersion: v2 appVersion: 0.8.3 - created: "2024-07-19T14:56:58.306577399Z" + created: "2024-07-23T05:14:36.261249415Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -827,7 +840,7 @@ entries: version: 0.8.3 - apiVersion: v2 appVersion: 0.8.3-beta.6 - created: "2024-07-19T14:56:58.305874355Z" + created: "2024-07-23T05:14:36.260575796Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -843,7 +856,7 @@ entries: version: 0.8.3-beta.6 - apiVersion: v2 appVersion: 0.8.3-beta.5 - created: "2024-07-19T14:56:58.305291015Z" + created: "2024-07-23T05:14:36.259943555Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -859,7 +872,7 @@ entries: version: 0.8.3-beta.5 - apiVersion: v2 appVersion: 0.8.3-beta.4 - created: "2024-07-19T14:56:58.304655327Z" + created: "2024-07-23T05:14:36.259354645Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -875,7 +888,7 @@ entries: version: 0.8.3-beta.4 - apiVersion: v2 appVersion: 0.8.3-beta.2 - created: "2024-07-19T14:56:58.303980717Z" + created: "2024-07-23T05:14:36.258677048Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -891,7 +904,7 @@ entries: version: 0.8.3-beta.2 - apiVersion: v2 appVersion: 0.8.3-beta.1 - created: "2024-07-19T14:56:58.303412455Z" + created: "2024-07-23T05:14:36.258101333Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -907,7 +920,7 @@ entries: version: 0.8.3-beta.1 - apiVersion: v2 appVersion: 0.8.2 - created: "2024-07-19T14:56:58.30279948Z" + created: "2024-07-23T05:14:36.257507042Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -923,7 +936,7 @@ entries: version: 0.8.2 - apiVersion: v2 appVersion: 0.8.2-beta.60 - created: "2024-07-19T14:56:58.301649389Z" + created: "2024-07-23T05:14:36.256810982Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -939,7 +952,7 @@ entries: version: 0.8.2-beta.60 - apiVersion: v2 appVersion: 0.8.2-beta.59 - created: "2024-07-19T14:56:58.300629353Z" + created: "2024-07-23T05:14:36.255275147Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -955,7 +968,7 @@ entries: version: 0.8.2-beta.59 - apiVersion: v2 appVersion: 0.8.2-beta.58 - created: "2024-07-19T14:56:58.29998532Z" + created: "2024-07-23T05:14:36.254474501Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -971,7 +984,7 @@ entries: version: 0.8.2-beta.58 - apiVersion: v2 appVersion: 0.8.2-beta.57 - created: "2024-07-19T14:56:58.299342107Z" + created: "2024-07-23T05:14:36.253808607Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -987,7 +1000,7 @@ entries: version: 0.8.2-beta.57 - apiVersion: v2 appVersion: 0.8.2-beta.56 - created: "2024-07-19T14:56:58.298687655Z" + created: "2024-07-23T05:14:36.253146681Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1003,7 +1016,7 @@ entries: version: 0.8.2-beta.56 - apiVersion: v2 appVersion: 0.8.2-beta.52 - created: "2024-07-19T14:56:58.29803773Z" + created: "2024-07-23T05:14:36.252478873Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1019,7 +1032,7 @@ entries: version: 0.8.2-beta.52 - apiVersion: v2 appVersion: 0.8.2-beta.51 - created: "2024-07-19T14:56:58.297386273Z" + created: "2024-07-23T05:14:36.251768576Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1035,7 +1048,7 @@ entries: version: 0.8.2-beta.51 - apiVersion: v2 appVersion: 0.8.2-beta.50 - created: "2024-07-19T14:56:58.296691274Z" + created: "2024-07-23T05:14:36.251108863Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1051,7 +1064,7 @@ entries: version: 0.8.2-beta.50 - apiVersion: v2 appVersion: 0.8.2-beta.49 - created: "2024-07-19T14:56:58.296017024Z" + created: "2024-07-23T05:14:36.250431748Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1067,7 +1080,7 @@ entries: version: 0.8.2-beta.49 - apiVersion: v2 appVersion: 0.8.2-beta.48 - created: "2024-07-19T14:56:58.294571215Z" + created: "2024-07-23T05:14:36.249474555Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1083,7 +1096,7 @@ entries: version: 0.8.2-beta.48 - apiVersion: v2 appVersion: 0.8.2-beta.47 - created: "2024-07-19T14:56:58.29392136Z" + created: "2024-07-23T05:14:36.248151423Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1099,7 +1112,7 @@ entries: version: 0.8.2-beta.47 - apiVersion: v2 appVersion: 0.8.2-beta.46 - created: "2024-07-19T14:56:58.293360222Z" + created: "2024-07-23T05:14:36.247550359Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1115,7 +1128,7 @@ entries: version: 0.8.2-beta.46 - apiVersion: v2 appVersion: 0.8.2-beta.45 - created: "2024-07-19T14:56:58.29272757Z" + created: "2024-07-23T05:14:36.246855862Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1131,7 +1144,7 @@ entries: version: 0.8.2-beta.45 - apiVersion: v2 appVersion: 0.8.2-beta.44 - created: "2024-07-19T14:56:58.292167753Z" + created: "2024-07-23T05:14:36.246257795Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1147,7 +1160,7 @@ entries: version: 0.8.2-beta.44 - apiVersion: v2 appVersion: 0.8.2-beta.43 - created: "2024-07-19T14:56:58.29156656Z" + created: "2024-07-23T05:14:36.245629441Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1163,7 +1176,7 @@ entries: version: 0.8.2-beta.43 - apiVersion: v2 appVersion: 0.8.2-beta.41 - created: "2024-07-19T14:56:58.290892741Z" + created: "2024-07-23T05:14:36.244927429Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1179,7 +1192,7 @@ entries: version: 0.8.2-beta.41 - apiVersion: v2 appVersion: 0.8.2-beta.40 - created: "2024-07-19T14:56:58.290205707Z" + created: "2024-07-23T05:14:36.244155507Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1195,7 +1208,7 @@ entries: version: 0.8.2-beta.40 - apiVersion: v2 appVersion: 0.8.2-beta.39 - created: "2024-07-19T14:56:58.289588094Z" + created: "2024-07-23T05:14:36.243569592Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1211,7 +1224,7 @@ entries: version: 0.8.2-beta.39 - apiVersion: v2 appVersion: 0.8.2-beta.38 - created: "2024-07-19T14:56:58.288217332Z" + created: "2024-07-23T05:14:36.242905802Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1227,7 +1240,7 @@ entries: version: 0.8.2-beta.38 - apiVersion: v2 appVersion: 0.8.2-beta.37 - created: "2024-07-19T14:56:58.28764328Z" + created: "2024-07-23T05:14:36.241651493Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1243,7 +1256,7 @@ entries: version: 0.8.2-beta.37 - apiVersion: v2 appVersion: 0.8.1 - created: "2024-07-19T14:56:58.287047436Z" + created: "2024-07-23T05:14:36.240733468Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -1257,4 +1270,4 @@ entries: urls: - https://openmined.github.io/PySyft/helm/syft-0.8.1.tgz version: 0.8.1 -generated: "2024-07-19T14:56:58.286141493Z" +generated: "2024-07-23T05:14:36.239770338Z" diff --git a/packages/grid/helm/repo/syft-0.8.8-beta.2.tgz b/packages/grid/helm/repo/syft-0.8.8-beta.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..05c860b0f264798a7a96e62f4a0cbd58cc7f2260 GIT binary patch literal 9977 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 D7)A+C literal 0 HcmV?d00001 diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml index 4b8824050fa..75043b1b7d1 100644 --- a/packages/grid/helm/syft/Chart.yaml +++ b/packages/grid/helm/syft/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: syft description: Perform numpy-like analysis on data that remains in someone elses server type: application -version: "0.8.8-beta.1" -appVersion: "0.8.8-beta.1" +version: "0.8.8-beta.2" +appVersion: "0.8.8-beta.2" home: https://github.com/OpenMined/PySyft/ icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml index 7d4d8110010..27e50438193 100644 --- a/packages/grid/helm/syft/values.yaml +++ b/packages/grid/helm/syft/values.yaml @@ -1,7 +1,7 @@ global: # Affects only backend, frontend, and seaweedfs containers registry: docker.io - version: 0.8.8-beta.1 + version: 0.8.8-beta.2 # Force default secret values for development. DO NOT SET THIS TO FALSE IN PRODUCTION randomizedSecrets: true diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg index a52dd904495..9d579446775 100644 --- a/packages/syft/setup.cfg +++ b/packages/syft/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = syft -version = attr: "0.8.8-beta.1" +version = attr: "0.8.8-beta.2" description = Perform numpy-like analysis on data that remains in someone elses server author = OpenMined author_email = info@openmined.org diff --git a/packages/syft/src/syft/VERSION b/packages/syft/src/syft/VERSION index 8742f2ae357..ab18b3a5a42 100644 --- a/packages/syft/src/syft/VERSION +++ b/packages/syft/src/syft/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.8-beta.1" +__version__ = "0.8.8-beta.2" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py index 230a50330d0..aa5128b7604 100644 --- a/packages/syft/src/syft/__init__.py +++ b/packages/syft/src/syft/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.8.8-beta.1" +__version__ = "0.8.8-beta.2" # stdlib from collections.abc import Callable diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml index 56f0eedc87d..cda53aa0678 100644 --- a/packages/syftcli/manifest.yml +++ b/packages/syftcli/manifest.yml @@ -1,11 +1,11 @@ manifestVersion: 1.0 -syftVersion: 0.8.8-beta.1 -dockerTag: 0.8.8-beta.1 +syftVersion: 0.8.8-beta.2 +dockerTag: 0.8.8-beta.2 images: - - docker.io/openmined/syft-frontend:0.8.8-beta.1 - - docker.io/openmined/syft-backend:0.8.8-beta.1 + - docker.io/openmined/syft-frontend:0.8.8-beta.2 + - docker.io/openmined/syft-backend:0.8.8-beta.2 - docker.io/library/mongo:7.0.4 - docker.io/traefik:v2.11.0 From 4dcc41c54c021f2b81362616fb3b5ff69193b279 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 23 Jul 2024 12:16:00 +0530 Subject: [PATCH 02/12] cache the data and mock property on dataset object --- packages/syft/src/syft/service/dataset/dataset.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py index 58329a06611..702e7e155c5 100644 --- a/packages/syft/src/syft/service/dataset/dataset.py +++ b/packages/syft/src/syft/service/dataset/dataset.py @@ -2,6 +2,7 @@ from collections.abc import Callable from datetime import datetime from enum import Enum +from functools import cached_property import logging import textwrap from typing import Any @@ -249,7 +250,7 @@ def pointer(self) -> Any: if api is not None and api.services is not None: return api.services.action.get_pointer(self.action_id) - @property + @cached_property def mock(self) -> SyftError | Any: api = APIRegistry.api_for( server_uid=self.server_uid, @@ -278,7 +279,7 @@ def has_permission(self, data_result: Any) -> bool: and data_result.endswith("denied") ) - @property + @cached_property def data(self) -> Any: # relative From ea8716679062d6c2f3ada202d157a98cda4eacf7 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:33:01 +0530 Subject: [PATCH 03/12] shift actions checkout position in cd pipeline --- .github/workflows/cd-feature-branch.yml | 540 ++++++++++++------------ 1 file changed, 270 insertions(+), 270 deletions(-) diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml index 0b67328c5c7..56884fa05bc 100644 --- a/.github/workflows/cd-feature-branch.yml +++ b/.github/workflows/cd-feature-branch.yml @@ -47,10 +47,6 @@ jobs: server_version: ${{ steps.release_metadata.outputs.server_version }} steps: - - uses: actions/checkout@v4 - with: - ref: ${{ github.event.inputs.release_branch }} - # actions/setup-python doesn't yet support ARM - name: Setup Python on x64 if: ${{ !endsWith(matrix.runner, '-arm64') }} @@ -82,6 +78,10 @@ jobs: sudo apt-get update sudo apt-get install git -y + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.release_branch }} + - name: Check python version run: | python --version @@ -110,269 +110,269 @@ jobs: run: | python scripts/bump_version.py --bump-to-stable ${{ steps.release_metadata.outputs.server_version}} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_LOGIN }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push `syft-backend` image to DockerHub - id: syft-backend-build - uses: docker/build-push-action@v6 - with: - context: ./packages - file: ./packages/grid/backend/backend.dockerfile - platforms: ${{ steps.release_metadata.outputs.release_platform }} - target: backend - outputs: type=image,name=openmined/syft-backend,push-by-digest=true,name-canonical=true,push=true - cache-from: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }} - cache-to: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max - - - name: Export digest for syft-backend - run: | - mkdir -p /tmp/digests/syft-backend - digest="${{ steps.syft-backend-build.outputs.digest }}" - touch "/tmp/digests/syft-backend/${digest#sha256:}" - - - name: Build and push `syft-frontend` image to DockerHub - id: syft-frontend-build - uses: docker/build-push-action@v6 - with: - context: ./packages/grid/frontend - file: ./packages/grid/frontend/frontend.dockerfile - platforms: ${{ steps.release_metadata.outputs.release_platform }} - outputs: type=image,name=openmined/syft-frontend,push-by-digest=true,name-canonical=true,push=true - target: syft-ui-development - cache-from: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform }} - cache-to: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - - name: Export digest for syft-frontend - run: | - mkdir -p /tmp/digests/syft-frontend - digest="${{ steps.syft-frontend-build.outputs.digest }}" - touch "/tmp/digests/syft-frontend/${digest#sha256:}" - - - name: Build and push `syft-seaweedfs` image to DockerHub - id: syft-seaweedfs-build - uses: docker/build-push-action@v6 - with: - context: ./packages/grid/seaweedfs - file: ./packages/grid/seaweedfs/seaweedfs.dockerfile - platforms: ${{ steps.release_metadata.outputs.release_platform }} - outputs: type=image,name=openmined/syft-seaweedfs,push-by-digest=true,name-canonical=true,push=true - cache-from: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform }} - cache-to: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - - name: Export digest for syft-seaweedfs - run: | - mkdir -p /tmp/digests/syft-seaweedfs - digest="${{ steps.syft-seaweedfs-build.outputs.digest }}" - touch "/tmp/digests/syft-seaweedfs/${digest#sha256:}" - - # Some of the dependencies of syft-enclave-attestation are not available for arm64 - # Hence, we are building syft-enclave-attestation only for x64 (see the `if` conditional) - - name: Build and push `syft-enclave-attestation` image to DockerHub - if: ${{ endsWith(matrix.runner, '-x64') }} - id: syft-enclave-attestation-build - uses: docker/build-push-action@v6 - with: - context: ./packages/grid/enclave/attestation - file: ./packages/grid/enclave/attestation/attestation.dockerfile - platforms: ${{ steps.release_metadata.outputs.release_platform }} - outputs: type=image,name=openmined/syft-enclave-attestation,push-by-digest=true,name-canonical=true,push=true - cache-from: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform }} - cache-to: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - - name: Export digest for syft-enclave-attestation - if: ${{ endsWith(matrix.runner, '-x64') }} - run: | - mkdir -p /tmp/digests/syft-enclave-attestation - digest="${{ steps.syft-enclave-attestation-build.outputs.digest }}" - touch "/tmp/digests/syft-enclave-attestation/${digest#sha256:}" - - - name: Build and push `syft` image to registry - id: syft-build - uses: docker/build-push-action@v6 - with: - context: ./packages/ - file: ./packages/grid/syft-client/syft.Dockerfile - outputs: type=image,name=openmined/syft-client,push-by-digest=true,name-canonical=true,push=true - platforms: ${{ steps.release_metadata.outputs.release_platform }} - cache-from: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }} - cache-to: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max - - - name: Export digest for `syft` image - run: | - mkdir -p /tmp/digests/syft - digest="${{ steps.syft-build.outputs.digest }}" - touch "/tmp/digests/syft/${digest#sha256:}" - - - name: Upload digests - uses: actions/upload-artifact@v4 - with: - name: digests-${{ steps.release_metadata.outputs.server_version }}-${{ steps.release_metadata.outputs.short_release_platform }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - #Used to merge x64 and arm64 into one docker image - merge-docker-images: - needs: [build-and-push-docker-images] - if: always() && (needs.build-and-push-docker-images.result == 'success') - - runs-on: sh-arc-linux-x64 - - outputs: - server_version: ${{ needs.build-and-push-docker-images.outputs.server_version }} - - steps: - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: /tmp/digests - pattern: digests-${{ needs.build-and-push-docker-images.outputs.server_version }}-* - merge-multiple: true - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_LOGIN }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Create manifest list and push for syft-backend - working-directory: /tmp/digests/syft-backend - run: | - docker buildx imagetools create \ - -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - $(printf 'openmined/syft-backend@sha256:%s ' *) - - - name: Create manifest list and push for syft-frontend - working-directory: /tmp/digests/syft-frontend - run: | - docker buildx imagetools create \ - -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - $(printf 'openmined/syft-frontend@sha256:%s ' *) - - - name: Create manifest list and push for syft-seaweedfs - working-directory: /tmp/digests/syft-seaweedfs - run: | - docker buildx imagetools create \ - -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - $(printf 'openmined/syft-seaweedfs@sha256:%s ' *) - - - name: Create manifest list and push for syft-enclave-attestation - working-directory: /tmp/digests/syft-enclave-attestation - run: | - docker buildx imagetools create \ - -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *) - - - name: Create manifest list and push for syft client - working-directory: /tmp/digests/syft - run: | - docker buildx imagetools create \ - -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - $(printf 'openmined/syft-client@sha256:%s ' *) - - deploy-syft: - needs: [merge-docker-images] - if: always() && needs.merge-docker-images.result == 'success' - - runs-on: ubuntu-latest - - steps: - - name: Permission to home directory - run: | - sudo chown -R $USER:$USER $HOME - - - uses: actions/checkout@v4 - with: - token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} - ref: ${{ github.event.inputs.release_branch }} - - # free 10GB of space - - name: Remove unnecessary files - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - docker image prune --all --force - docker builder prune --all --force - docker system prune --all --force - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML - uv --version - - - name: Bump to Final Release version - run: | - python scripts/bump_version.py --bump-to-stable ${{ needs.merge-docker-images.outputs.server_version }} - - - name: Build Helm Chart - shell: bash - run: | - # install k3d - K3D_VERSION=v5.6.3 - wget https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64 - mv k3d-linux-amd64 k3d - chmod +x k3d - export PATH=`pwd`:$PATH - k3d version - - #Install Devspace - DEVSPACE_VERSION=v6.3.12 - curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace - chmod +x devspace - devspace version - - # Install helm - curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - helm version - - tox -e syft.build.helm - tox -e syft.package.helm - - - name: Linting - run: | - tox -e lint || true - - - name: Manual Build and Publish - run: | - tox -e syft.publish - if [[ "${{ github.event.inputs.release_platform }}" == "TEST_PYPI" ]]; then - twine upload -r testpypi -u __token__ -p ${{ secrets.OM_SYFT_TEST_PYPI_TOKEN }} packages/syft/dist/* - fi - - # Checkout to gh-pages and update helm repo - - name: Checkout to gh-pages - uses: actions/checkout@v4 - with: - ref: gh-pages - token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} - path: ghpages - - - name: Copy helm repo files from Syft Repo - run: | - rm -rf ghpages/helm/* - cp -R packages/grid/helm/repo/. ghpages/helm/ - - - name: Commit changes to gh-pages - uses: EndBug/add-and-commit@v9 - with: - author_name: ${{ secrets.OM_BOT_NAME }} - author_email: ${{ secrets.OM_BOT_EMAIL }} - message: "Update Helm package from Syft Repo" - add: "helm/" - push: "origin gh-pages" - cwd: "./ghpages/" + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 + + # - name: Login to Docker + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKER_LOGIN }} + # password: ${{ secrets.DOCKER_PASSWORD }} + + # - name: Build and push `syft-backend` image to DockerHub + # id: syft-backend-build + # uses: docker/build-push-action@v6 + # with: + # context: ./packages + # file: ./packages/grid/backend/backend.dockerfile + # platforms: ${{ steps.release_metadata.outputs.release_platform }} + # target: backend + # outputs: type=image,name=openmined/syft-backend,push-by-digest=true,name-canonical=true,push=true + # cache-from: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }} + # cache-to: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max + + # - name: Export digest for syft-backend + # run: | + # mkdir -p /tmp/digests/syft-backend + # digest="${{ steps.syft-backend-build.outputs.digest }}" + # touch "/tmp/digests/syft-backend/${digest#sha256:}" + + # - name: Build and push `syft-frontend` image to DockerHub + # id: syft-frontend-build + # uses: docker/build-push-action@v6 + # with: + # context: ./packages/grid/frontend + # file: ./packages/grid/frontend/frontend.dockerfile + # platforms: ${{ steps.release_metadata.outputs.release_platform }} + # outputs: type=image,name=openmined/syft-frontend,push-by-digest=true,name-canonical=true,push=true + # target: syft-ui-development + # cache-from: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform }} + # cache-to: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + # - name: Export digest for syft-frontend + # run: | + # mkdir -p /tmp/digests/syft-frontend + # digest="${{ steps.syft-frontend-build.outputs.digest }}" + # touch "/tmp/digests/syft-frontend/${digest#sha256:}" + + # - name: Build and push `syft-seaweedfs` image to DockerHub + # id: syft-seaweedfs-build + # uses: docker/build-push-action@v6 + # with: + # context: ./packages/grid/seaweedfs + # file: ./packages/grid/seaweedfs/seaweedfs.dockerfile + # platforms: ${{ steps.release_metadata.outputs.release_platform }} + # outputs: type=image,name=openmined/syft-seaweedfs,push-by-digest=true,name-canonical=true,push=true + # cache-from: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform }} + # cache-to: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + # - name: Export digest for syft-seaweedfs + # run: | + # mkdir -p /tmp/digests/syft-seaweedfs + # digest="${{ steps.syft-seaweedfs-build.outputs.digest }}" + # touch "/tmp/digests/syft-seaweedfs/${digest#sha256:}" + + # # Some of the dependencies of syft-enclave-attestation are not available for arm64 + # # Hence, we are building syft-enclave-attestation only for x64 (see the `if` conditional) + # - name: Build and push `syft-enclave-attestation` image to DockerHub + # if: ${{ endsWith(matrix.runner, '-x64') }} + # id: syft-enclave-attestation-build + # uses: docker/build-push-action@v6 + # with: + # context: ./packages/grid/enclave/attestation + # file: ./packages/grid/enclave/attestation/attestation.dockerfile + # platforms: ${{ steps.release_metadata.outputs.release_platform }} + # outputs: type=image,name=openmined/syft-enclave-attestation,push-by-digest=true,name-canonical=true,push=true + # cache-from: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform }} + # cache-to: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + # - name: Export digest for syft-enclave-attestation + # if: ${{ endsWith(matrix.runner, '-x64') }} + # run: | + # mkdir -p /tmp/digests/syft-enclave-attestation + # digest="${{ steps.syft-enclave-attestation-build.outputs.digest }}" + # touch "/tmp/digests/syft-enclave-attestation/${digest#sha256:}" + + # - name: Build and push `syft` image to registry + # id: syft-build + # uses: docker/build-push-action@v6 + # with: + # context: ./packages/ + # file: ./packages/grid/syft-client/syft.Dockerfile + # outputs: type=image,name=openmined/syft-client,push-by-digest=true,name-canonical=true,push=true + # platforms: ${{ steps.release_metadata.outputs.release_platform }} + # cache-from: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }} + # cache-to: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max + + # - name: Export digest for `syft` image + # run: | + # mkdir -p /tmp/digests/syft + # digest="${{ steps.syft-build.outputs.digest }}" + # touch "/tmp/digests/syft/${digest#sha256:}" + + # - name: Upload digests + # uses: actions/upload-artifact@v4 + # with: + # name: digests-${{ steps.release_metadata.outputs.server_version }}-${{ steps.release_metadata.outputs.short_release_platform }} + # path: /tmp/digests/* + # if-no-files-found: error + # retention-days: 1 + + # #Used to merge x64 and arm64 into one docker image + # merge-docker-images: + # needs: [build-and-push-docker-images] + # if: always() && (needs.build-and-push-docker-images.result == 'success') + + # runs-on: sh-arc-linux-x64 + + # outputs: + # server_version: ${{ needs.build-and-push-docker-images.outputs.server_version }} + + # steps: + # - name: Download digests + # uses: actions/download-artifact@v4 + # with: + # path: /tmp/digests + # pattern: digests-${{ needs.build-and-push-docker-images.outputs.server_version }}-* + # merge-multiple: true + + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 + + # - name: Login to Docker + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKER_LOGIN }} + # password: ${{ secrets.DOCKER_PASSWORD }} + + # - name: Create manifest list and push for syft-backend + # working-directory: /tmp/digests/syft-backend + # run: | + # docker buildx imagetools create \ + # -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ + # $(printf 'openmined/syft-backend@sha256:%s ' *) + + # - name: Create manifest list and push for syft-frontend + # working-directory: /tmp/digests/syft-frontend + # run: | + # docker buildx imagetools create \ + # -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ + # $(printf 'openmined/syft-frontend@sha256:%s ' *) + + # - name: Create manifest list and push for syft-seaweedfs + # working-directory: /tmp/digests/syft-seaweedfs + # run: | + # docker buildx imagetools create \ + # -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.server_version }} \ + # $(printf 'openmined/syft-seaweedfs@sha256:%s ' *) + + # - name: Create manifest list and push for syft-enclave-attestation + # working-directory: /tmp/digests/syft-enclave-attestation + # run: | + # docker buildx imagetools create \ + # -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.server_version }} \ + # $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *) + + # - name: Create manifest list and push for syft client + # working-directory: /tmp/digests/syft + # run: | + # docker buildx imagetools create \ + # -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.server_version }} \ + # $(printf 'openmined/syft-client@sha256:%s ' *) + + # deploy-syft: + # needs: [merge-docker-images] + # if: always() && needs.merge-docker-images.result == 'success' + + # runs-on: ubuntu-latest + + # steps: + # - name: Permission to home directory + # run: | + # sudo chown -R $USER:$USER $HOME + + # - uses: actions/checkout@v4 + # with: + # token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} + # ref: ${{ github.event.inputs.release_branch }} + + # # free 10GB of space + # - name: Remove unnecessary files + # run: | + # sudo rm -rf /usr/share/dotnet + # sudo rm -rf "$AGENT_TOOLSDIRECTORY" + # docker image prune --all --force + # docker builder prune --all --force + # docker system prune --all --force + + # - name: Set up Python + # uses: actions/setup-python@v5 + # with: + # python-version: "3.12" + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML + # uv --version + + # - name: Bump to Final Release version + # run: | + # python scripts/bump_version.py --bump-to-stable ${{ needs.merge-docker-images.outputs.server_version }} + + # - name: Build Helm Chart + # shell: bash + # run: | + # # install k3d + # K3D_VERSION=v5.6.3 + # wget https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64 + # mv k3d-linux-amd64 k3d + # chmod +x k3d + # export PATH=`pwd`:$PATH + # k3d version + + # #Install Devspace + # DEVSPACE_VERSION=v6.3.12 + # curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace + # chmod +x devspace + # devspace version + + # # Install helm + # curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash + # helm version + + # tox -e syft.build.helm + # tox -e syft.package.helm + + # - name: Linting + # run: | + # tox -e lint || true + + # - name: Manual Build and Publish + # run: | + # tox -e syft.publish + # if [[ "${{ github.event.inputs.release_platform }}" == "TEST_PYPI" ]]; then + # twine upload -r testpypi -u __token__ -p ${{ secrets.OM_SYFT_TEST_PYPI_TOKEN }} packages/syft/dist/* + # fi + + # # Checkout to gh-pages and update helm repo + # - name: Checkout to gh-pages + # uses: actions/checkout@v4 + # with: + # ref: gh-pages + # token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} + # path: ghpages + + # - name: Copy helm repo files from Syft Repo + # run: | + # rm -rf ghpages/helm/* + # cp -R packages/grid/helm/repo/. ghpages/helm/ + + # - name: Commit changes to gh-pages + # uses: EndBug/add-and-commit@v9 + # with: + # author_name: ${{ secrets.OM_BOT_NAME }} + # author_email: ${{ secrets.OM_BOT_EMAIL }} + # message: "Update Helm package from Syft Repo" + # add: "helm/" + # push: "origin gh-pages" + # cwd: "./ghpages/" From f6dc708f7969ca074f5cdaa79163bc2b9ba46b72 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:38:00 +0530 Subject: [PATCH 04/12] fix error in github.events --> github.event --- .github/workflows/cd-feature-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml index 56884fa05bc..04ca7ac6331 100644 --- a/.github/workflows/cd-feature-branch.yml +++ b/.github/workflows/cd-feature-branch.yml @@ -104,7 +104,7 @@ jobs: echo "release_platform=linux/arm64" >> $GITHUB_OUTPUT echo "short_release_platform=arm64" >> $GITHUB_OUTPUT fi - echo "server_version=${{ github.event.inputs.release_version }}+${{github.events.inputs.release_id}}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT + echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT - name: Bump to Final Release version run: | From 57ea94e1d6c83a469720e2ec46eba02ab7f3b47b Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:53:36 +0530 Subject: [PATCH 05/12] modify docker tags to be compatible --- .github/workflows/cd-feature-branch.yml | 534 ++++++++++++------------ 1 file changed, 268 insertions(+), 266 deletions(-) diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml index 04ca7ac6331..496307bbca7 100644 --- a/.github/workflows/cd-feature-branch.yml +++ b/.github/workflows/cd-feature-branch.yml @@ -45,6 +45,7 @@ jobs: outputs: server_version: ${{ steps.release_metadata.outputs.server_version }} + short_server_version: ${{ steps.release_metadata.outputs.short_server_version }} steps: # actions/setup-python doesn't yet support ARM @@ -105,274 +106,275 @@ jobs: echo "short_release_platform=arm64" >> $GITHUB_OUTPUT fi echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT + echo "short_server_version=${{ github.event.inputs.release_version }}" >> $GITHUB_OUTPUT - name: Bump to Final Release version run: | python scripts/bump_version.py --bump-to-stable ${{ steps.release_metadata.outputs.server_version}} - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - - # - name: Login to Docker - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKER_LOGIN }} - # password: ${{ secrets.DOCKER_PASSWORD }} - - # - name: Build and push `syft-backend` image to DockerHub - # id: syft-backend-build - # uses: docker/build-push-action@v6 - # with: - # context: ./packages - # file: ./packages/grid/backend/backend.dockerfile - # platforms: ${{ steps.release_metadata.outputs.release_platform }} - # target: backend - # outputs: type=image,name=openmined/syft-backend,push-by-digest=true,name-canonical=true,push=true - # cache-from: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }} - # cache-to: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max - - # - name: Export digest for syft-backend - # run: | - # mkdir -p /tmp/digests/syft-backend - # digest="${{ steps.syft-backend-build.outputs.digest }}" - # touch "/tmp/digests/syft-backend/${digest#sha256:}" - - # - name: Build and push `syft-frontend` image to DockerHub - # id: syft-frontend-build - # uses: docker/build-push-action@v6 - # with: - # context: ./packages/grid/frontend - # file: ./packages/grid/frontend/frontend.dockerfile - # platforms: ${{ steps.release_metadata.outputs.release_platform }} - # outputs: type=image,name=openmined/syft-frontend,push-by-digest=true,name-canonical=true,push=true - # target: syft-ui-development - # cache-from: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform }} - # cache-to: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - # - name: Export digest for syft-frontend - # run: | - # mkdir -p /tmp/digests/syft-frontend - # digest="${{ steps.syft-frontend-build.outputs.digest }}" - # touch "/tmp/digests/syft-frontend/${digest#sha256:}" - - # - name: Build and push `syft-seaweedfs` image to DockerHub - # id: syft-seaweedfs-build - # uses: docker/build-push-action@v6 - # with: - # context: ./packages/grid/seaweedfs - # file: ./packages/grid/seaweedfs/seaweedfs.dockerfile - # platforms: ${{ steps.release_metadata.outputs.release_platform }} - # outputs: type=image,name=openmined/syft-seaweedfs,push-by-digest=true,name-canonical=true,push=true - # cache-from: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform }} - # cache-to: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - # - name: Export digest for syft-seaweedfs - # run: | - # mkdir -p /tmp/digests/syft-seaweedfs - # digest="${{ steps.syft-seaweedfs-build.outputs.digest }}" - # touch "/tmp/digests/syft-seaweedfs/${digest#sha256:}" - - # # Some of the dependencies of syft-enclave-attestation are not available for arm64 - # # Hence, we are building syft-enclave-attestation only for x64 (see the `if` conditional) - # - name: Build and push `syft-enclave-attestation` image to DockerHub - # if: ${{ endsWith(matrix.runner, '-x64') }} - # id: syft-enclave-attestation-build - # uses: docker/build-push-action@v6 - # with: - # context: ./packages/grid/enclave/attestation - # file: ./packages/grid/enclave/attestation/attestation.dockerfile - # platforms: ${{ steps.release_metadata.outputs.release_platform }} - # outputs: type=image,name=openmined/syft-enclave-attestation,push-by-digest=true,name-canonical=true,push=true - # cache-from: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform }} - # cache-to: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max - - # - name: Export digest for syft-enclave-attestation - # if: ${{ endsWith(matrix.runner, '-x64') }} - # run: | - # mkdir -p /tmp/digests/syft-enclave-attestation - # digest="${{ steps.syft-enclave-attestation-build.outputs.digest }}" - # touch "/tmp/digests/syft-enclave-attestation/${digest#sha256:}" - - # - name: Build and push `syft` image to registry - # id: syft-build - # uses: docker/build-push-action@v6 - # with: - # context: ./packages/ - # file: ./packages/grid/syft-client/syft.Dockerfile - # outputs: type=image,name=openmined/syft-client,push-by-digest=true,name-canonical=true,push=true - # platforms: ${{ steps.release_metadata.outputs.release_platform }} - # cache-from: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }} - # cache-to: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max - - # - name: Export digest for `syft` image - # run: | - # mkdir -p /tmp/digests/syft - # digest="${{ steps.syft-build.outputs.digest }}" - # touch "/tmp/digests/syft/${digest#sha256:}" - - # - name: Upload digests - # uses: actions/upload-artifact@v4 - # with: - # name: digests-${{ steps.release_metadata.outputs.server_version }}-${{ steps.release_metadata.outputs.short_release_platform }} - # path: /tmp/digests/* - # if-no-files-found: error - # retention-days: 1 - - # #Used to merge x64 and arm64 into one docker image - # merge-docker-images: - # needs: [build-and-push-docker-images] - # if: always() && (needs.build-and-push-docker-images.result == 'success') - - # runs-on: sh-arc-linux-x64 - - # outputs: - # server_version: ${{ needs.build-and-push-docker-images.outputs.server_version }} - - # steps: - # - name: Download digests - # uses: actions/download-artifact@v4 - # with: - # path: /tmp/digests - # pattern: digests-${{ needs.build-and-push-docker-images.outputs.server_version }}-* - # merge-multiple: true - - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - - # - name: Login to Docker - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKER_LOGIN }} - # password: ${{ secrets.DOCKER_PASSWORD }} - - # - name: Create manifest list and push for syft-backend - # working-directory: /tmp/digests/syft-backend - # run: | - # docker buildx imagetools create \ - # -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - # $(printf 'openmined/syft-backend@sha256:%s ' *) - - # - name: Create manifest list and push for syft-frontend - # working-directory: /tmp/digests/syft-frontend - # run: | - # docker buildx imagetools create \ - # -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - # $(printf 'openmined/syft-frontend@sha256:%s ' *) - - # - name: Create manifest list and push for syft-seaweedfs - # working-directory: /tmp/digests/syft-seaweedfs - # run: | - # docker buildx imagetools create \ - # -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - # $(printf 'openmined/syft-seaweedfs@sha256:%s ' *) - - # - name: Create manifest list and push for syft-enclave-attestation - # working-directory: /tmp/digests/syft-enclave-attestation - # run: | - # docker buildx imagetools create \ - # -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - # $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *) - - # - name: Create manifest list and push for syft client - # working-directory: /tmp/digests/syft - # run: | - # docker buildx imagetools create \ - # -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.server_version }} \ - # $(printf 'openmined/syft-client@sha256:%s ' *) - - # deploy-syft: - # needs: [merge-docker-images] - # if: always() && needs.merge-docker-images.result == 'success' - - # runs-on: ubuntu-latest - - # steps: - # - name: Permission to home directory - # run: | - # sudo chown -R $USER:$USER $HOME - - # - uses: actions/checkout@v4 - # with: - # token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} - # ref: ${{ github.event.inputs.release_branch }} - - # # free 10GB of space - # - name: Remove unnecessary files - # run: | - # sudo rm -rf /usr/share/dotnet - # sudo rm -rf "$AGENT_TOOLSDIRECTORY" - # docker image prune --all --force - # docker builder prune --all --force - # docker system prune --all --force - - # - name: Set up Python - # uses: actions/setup-python@v5 - # with: - # python-version: "3.12" - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML - # uv --version - - # - name: Bump to Final Release version - # run: | - # python scripts/bump_version.py --bump-to-stable ${{ needs.merge-docker-images.outputs.server_version }} - - # - name: Build Helm Chart - # shell: bash - # run: | - # # install k3d - # K3D_VERSION=v5.6.3 - # wget https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64 - # mv k3d-linux-amd64 k3d - # chmod +x k3d - # export PATH=`pwd`:$PATH - # k3d version - - # #Install Devspace - # DEVSPACE_VERSION=v6.3.12 - # curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace - # chmod +x devspace - # devspace version - - # # Install helm - # curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - # helm version - - # tox -e syft.build.helm - # tox -e syft.package.helm - - # - name: Linting - # run: | - # tox -e lint || true - - # - name: Manual Build and Publish - # run: | - # tox -e syft.publish - # if [[ "${{ github.event.inputs.release_platform }}" == "TEST_PYPI" ]]; then - # twine upload -r testpypi -u __token__ -p ${{ secrets.OM_SYFT_TEST_PYPI_TOKEN }} packages/syft/dist/* - # fi - - # # Checkout to gh-pages and update helm repo - # - name: Checkout to gh-pages - # uses: actions/checkout@v4 - # with: - # ref: gh-pages - # token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} - # path: ghpages - - # - name: Copy helm repo files from Syft Repo - # run: | - # rm -rf ghpages/helm/* - # cp -R packages/grid/helm/repo/. ghpages/helm/ - - # - name: Commit changes to gh-pages - # uses: EndBug/add-and-commit@v9 - # with: - # author_name: ${{ secrets.OM_BOT_NAME }} - # author_email: ${{ secrets.OM_BOT_EMAIL }} - # message: "Update Helm package from Syft Repo" - # add: "helm/" - # push: "origin gh-pages" - # cwd: "./ghpages/" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_LOGIN }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push `syft-backend` image to DockerHub + id: syft-backend-build + uses: docker/build-push-action@v6 + with: + context: ./packages + file: ./packages/grid/backend/backend.dockerfile + platforms: ${{ steps.release_metadata.outputs.release_platform }} + target: backend + outputs: type=image,name=openmined/syft-backend,push-by-digest=true,name-canonical=true,push=true + cache-from: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }} + cache-to: type=registry,ref=openmined/syft-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max + + - name: Export digest for syft-backend + run: | + mkdir -p /tmp/digests/syft-backend + digest="${{ steps.syft-backend-build.outputs.digest }}" + touch "/tmp/digests/syft-backend/${digest#sha256:}" + + - name: Build and push `syft-frontend` image to DockerHub + id: syft-frontend-build + uses: docker/build-push-action@v6 + with: + context: ./packages/grid/frontend + file: ./packages/grid/frontend/frontend.dockerfile + platforms: ${{ steps.release_metadata.outputs.release_platform }} + outputs: type=image,name=openmined/syft-frontend,push-by-digest=true,name-canonical=true,push=true + target: syft-ui-development + cache-from: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform }} + cache-to: type=registry,ref=openmined/syft-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + - name: Export digest for syft-frontend + run: | + mkdir -p /tmp/digests/syft-frontend + digest="${{ steps.syft-frontend-build.outputs.digest }}" + touch "/tmp/digests/syft-frontend/${digest#sha256:}" + + - name: Build and push `syft-seaweedfs` image to DockerHub + id: syft-seaweedfs-build + uses: docker/build-push-action@v6 + with: + context: ./packages/grid/seaweedfs + file: ./packages/grid/seaweedfs/seaweedfs.dockerfile + platforms: ${{ steps.release_metadata.outputs.release_platform }} + outputs: type=image,name=openmined/syft-seaweedfs,push-by-digest=true,name-canonical=true,push=true + cache-from: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform }} + cache-to: type=registry,ref=openmined/syft-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + - name: Export digest for syft-seaweedfs + run: | + mkdir -p /tmp/digests/syft-seaweedfs + digest="${{ steps.syft-seaweedfs-build.outputs.digest }}" + touch "/tmp/digests/syft-seaweedfs/${digest#sha256:}" + + # Some of the dependencies of syft-enclave-attestation are not available for arm64 + # Hence, we are building syft-enclave-attestation only for x64 (see the `if` conditional) + - name: Build and push `syft-enclave-attestation` image to DockerHub + if: ${{ endsWith(matrix.runner, '-x64') }} + id: syft-enclave-attestation-build + uses: docker/build-push-action@v6 + with: + context: ./packages/grid/enclave/attestation + file: ./packages/grid/enclave/attestation/attestation.dockerfile + platforms: ${{ steps.release_metadata.outputs.release_platform }} + outputs: type=image,name=openmined/syft-enclave-attestation,push-by-digest=true,name-canonical=true,push=true + cache-from: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform }} + cache-to: type=registry,ref=openmined/syft-enclave-attestation:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max + + - name: Export digest for syft-enclave-attestation + if: ${{ endsWith(matrix.runner, '-x64') }} + run: | + mkdir -p /tmp/digests/syft-enclave-attestation + digest="${{ steps.syft-enclave-attestation-build.outputs.digest }}" + touch "/tmp/digests/syft-enclave-attestation/${digest#sha256:}" + + - name: Build and push `syft` image to registry + id: syft-build + uses: docker/build-push-action@v6 + with: + context: ./packages/ + file: ./packages/grid/syft-client/syft.Dockerfile + outputs: type=image,name=openmined/syft-client,push-by-digest=true,name-canonical=true,push=true + platforms: ${{ steps.release_metadata.outputs.release_platform }} + cache-from: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }} + cache-to: type=registry,ref=openmined/syft-client:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max + + - name: Export digest for `syft` image + run: | + mkdir -p /tmp/digests/syft + digest="${{ steps.syft-build.outputs.digest }}" + touch "/tmp/digests/syft/${digest#sha256:}" + + - name: Upload digests + uses: actions/upload-artifact@v4 + with: + name: digests-${{ steps.release_metadata.outputs.server_version }}-${{ steps.release_metadata.outputs.short_release_platform }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + #Used to merge x64 and arm64 into one docker image + merge-docker-images: + needs: [build-and-push-docker-images] + if: always() && (needs.build-and-push-docker-images.result == 'success') + + runs-on: sh-arc-linux-x64 + + outputs: + server_version: ${{ needs.build-and-push-docker-images.outputs.server_version }} + + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-${{ needs.build-and-push-docker-images.outputs.server_version }}-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_LOGIN }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Create manifest list and push for syft-backend + working-directory: /tmp/digests/syft-backend + run: | + docker buildx imagetools create \ + -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + $(printf 'openmined/syft-backend@sha256:%s ' *) + + - name: Create manifest list and push for syft-frontend + working-directory: /tmp/digests/syft-frontend + run: | + docker buildx imagetools create \ + -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + $(printf 'openmined/syft-frontend@sha256:%s ' *) + + - name: Create manifest list and push for syft-seaweedfs + working-directory: /tmp/digests/syft-seaweedfs + run: | + docker buildx imagetools create \ + -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + $(printf 'openmined/syft-seaweedfs@sha256:%s ' *) + + - name: Create manifest list and push for syft-enclave-attestation + working-directory: /tmp/digests/syft-enclave-attestation + run: | + docker buildx imagetools create \ + -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *) + + - name: Create manifest list and push for syft client + working-directory: /tmp/digests/syft + run: | + docker buildx imagetools create \ + -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + $(printf 'openmined/syft-client@sha256:%s ' *) + + deploy-syft: + needs: [merge-docker-images] + if: always() && needs.merge-docker-images.result == 'success' + + runs-on: ubuntu-latest + + steps: + - name: Permission to home directory + run: | + sudo chown -R $USER:$USER $HOME + + - uses: actions/checkout@v4 + with: + token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} + ref: ${{ github.event.inputs.release_branch }} + + # free 10GB of space + - name: Remove unnecessary files + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + docker image prune --all --force + docker builder prune --all --force + docker system prune --all --force + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.12" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML + uv --version + + - name: Bump to Final Release version + run: | + python scripts/bump_version.py --bump-to-stable ${{ needs.merge-docker-images.outputs.server_version }} + + - name: Build Helm Chart + shell: bash + run: | + # install k3d + K3D_VERSION=v5.6.3 + wget https://github.com/k3d-io/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64 + mv k3d-linux-amd64 k3d + chmod +x k3d + export PATH=`pwd`:$PATH + k3d version + + #Install Devspace + DEVSPACE_VERSION=v6.3.12 + curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace + chmod +x devspace + devspace version + + # Install helm + curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash + helm version + + tox -e syft.build.helm + tox -e syft.package.helm + + - name: Linting + run: | + tox -e lint || true + + - name: Manual Build and Publish + run: | + tox -e syft.publish + if [[ "${{ github.event.inputs.release_platform }}" == "TEST_PYPI" ]]; then + twine upload -r testpypi -u __token__ -p ${{ secrets.OM_SYFT_TEST_PYPI_TOKEN }} packages/syft/dist/* + fi + + # Checkout to gh-pages and update helm repo + - name: Checkout to gh-pages + uses: actions/checkout@v4 + with: + ref: gh-pages + token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }} + path: ghpages + + - name: Copy helm repo files from Syft Repo + run: | + rm -rf ghpages/helm/* + cp -R packages/grid/helm/repo/. ghpages/helm/ + + - name: Commit changes to gh-pages + uses: EndBug/add-and-commit@v9 + with: + author_name: ${{ secrets.OM_BOT_NAME }} + author_email: ${{ secrets.OM_BOT_EMAIL }} + message: "Update Helm package from Syft Repo" + add: "helm/" + push: "origin gh-pages" + cwd: "./ghpages/" From 0d015e0266e658f8a586a4d97f9c132845db8592 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Tue, 23 Jul 2024 13:08:33 +0530 Subject: [PATCH 06/12] revert cache_property to property on data and mock methods - clear display when showing warning on calling self.data --- packages/syft/src/syft/service/dataset/dataset.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py index 702e7e155c5..10b5be04ca9 100644 --- a/packages/syft/src/syft/service/dataset/dataset.py +++ b/packages/syft/src/syft/service/dataset/dataset.py @@ -2,7 +2,6 @@ from collections.abc import Callable from datetime import datetime from enum import Enum -from functools import cached_property import logging import textwrap from typing import Any @@ -250,7 +249,7 @@ def pointer(self) -> Any: if api is not None and api.services is not None: return api.services.action.get_pointer(self.action_id) - @cached_property + @property def mock(self) -> SyftError | Any: api = APIRegistry.api_for( server_uid=self.server_uid, @@ -279,7 +278,7 @@ def has_permission(self, data_result: Any) -> bool: and data_result.endswith("denied") ) - @cached_property + @property def data(self) -> Any: # relative @@ -296,7 +295,7 @@ def data(self) -> Any: warning = SyftError( message="You do not have permission to access private data." ) - display(warning) + display(warning, clear=True) return None From fe1acf7deade581f94c93f286c7f55ee50111697 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:31:23 +0530 Subject: [PATCH 07/12] add test sha --- .github/workflows/test-sha.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/test-sha.yaml diff --git a/.github/workflows/test-sha.yaml b/.github/workflows/test-sha.yaml new file mode 100644 index 00000000000..9e9c644bc88 --- /dev/null +++ b/.github/workflows/test-sha.yaml @@ -0,0 +1,26 @@ +name: Get Actual Head SHA + +on: + workflow_dispatch: + inputs: + branch: + description: "Branch to run the workflow on" + required: true + default: "main" + +jobs: + get-sha: + runs-on: ubuntu-latest + + steps: + - name: Check out the specified branch + uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.branch }} + + - name: Get the actual commit SHA + id: get-sha + run: echo "ACTUAL_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV + + - name: Print the actual commit SHA + run: echo "The actual commit SHA is ${{ env.ACTUAL_SHA }}" From 5940b9b8cb864474a1960147b0f7fce92ec2fcf8 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:35:16 +0530 Subject: [PATCH 08/12] add github.sha for testing --- .github/workflows/test-sha.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-sha.yaml b/.github/workflows/test-sha.yaml index 9e9c644bc88..adf5c555a90 100644 --- a/.github/workflows/test-sha.yaml +++ b/.github/workflows/test-sha.yaml @@ -24,3 +24,6 @@ jobs: - name: Print the actual commit SHA run: echo "The actual commit SHA is ${{ env.ACTUAL_SHA }}" + + - name: Print Github SHA + run: echo "The actual commit SHA is ${{ github.sha }}" From cf929486084e716d9f58bf3651d17c8e7a596027 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:39:02 +0530 Subject: [PATCH 09/12] fix feature branch commit hash --- .github/workflows/cd-feature-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml index 496307bbca7..5d13d817315 100644 --- a/.github/workflows/cd-feature-branch.yml +++ b/.github/workflows/cd-feature-branch.yml @@ -105,7 +105,7 @@ jobs: echo "release_platform=linux/arm64" >> $GITHUB_OUTPUT echo "short_release_platform=arm64" >> $GITHUB_OUTPUT fi - echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT + echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT echo "short_server_version=${{ github.event.inputs.release_version }}" >> $GITHUB_OUTPUT - name: Bump to Final Release version From c518ab5dc626dcd7046cfe9e03033e5295b28ff4 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:39:43 +0530 Subject: [PATCH 10/12] fix string format in cd-syft.yml remove test-sha.yml --- .github/workflows/cd-syft.yml | 4 ++-- .github/workflows/test-sha.yaml | 29 ----------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 .github/workflows/test-sha.yaml diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index f9b0cd12295..97d22f442ff 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -12,8 +12,8 @@ on: default: "false" type: choice options: - - false - - true + - "false" + - "true" release_platform: description: "Release Platform" diff --git a/.github/workflows/test-sha.yaml b/.github/workflows/test-sha.yaml deleted file mode 100644 index adf5c555a90..00000000000 --- a/.github/workflows/test-sha.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Get Actual Head SHA - -on: - workflow_dispatch: - inputs: - branch: - description: "Branch to run the workflow on" - required: true - default: "main" - -jobs: - get-sha: - runs-on: ubuntu-latest - - steps: - - name: Check out the specified branch - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.branch }} - - - name: Get the actual commit SHA - id: get-sha - run: echo "ACTUAL_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV - - - name: Print the actual commit SHA - run: echo "The actual commit SHA is ${{ env.ACTUAL_SHA }}" - - - name: Print Github SHA - run: echo "The actual commit SHA is ${{ github.sha }}" From cabf167454e7375f03d223be1d9ad6fbaaebcd71 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:14:46 +0530 Subject: [PATCH 11/12] added commit references to syft code base --- .github/workflows/cd-feature-branch.yml | 27 +++++++------- packages/syft/src/syft/__init__.py | 1 + packages/syft/src/syft/commit.py | 3 ++ packages/syft/src/syft/update_commit.py | 48 +++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 packages/syft/src/syft/commit.py create mode 100644 packages/syft/src/syft/update_commit.py diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml index 5d13d817315..537c9a9b72e 100644 --- a/.github/workflows/cd-feature-branch.yml +++ b/.github/workflows/cd-feature-branch.yml @@ -15,11 +15,6 @@ on: required: true type: string - release_id: - description: "A Unique Identifier for the Release, which would be appended as version+release_id, Can contain only [A-Z][a-z][0-9][.]" - required: true - type: string - release_platform: description: "Release Platform" required: true @@ -45,7 +40,6 @@ jobs: outputs: server_version: ${{ steps.release_metadata.outputs.server_version }} - short_server_version: ${{ steps.release_metadata.outputs.short_server_version }} steps: # actions/setup-python doesn't yet support ARM @@ -105,13 +99,16 @@ jobs: echo "release_platform=linux/arm64" >> $GITHUB_OUTPUT echo "short_release_platform=arm64" >> $GITHUB_OUTPUT fi - echo "server_version=${{ github.event.inputs.release_version }}+${{ github.event.inputs.release_id }}.$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "short_server_version=${{ github.event.inputs.release_version }}" >> $GITHUB_OUTPUT + echo "server_version=${{ github.event.inputs.release_version }}" >> $GITHUB_OUTPUT - name: Bump to Final Release version run: | python scripts/bump_version.py --bump-to-stable ${{ steps.release_metadata.outputs.server_version}} + - name: Update Commit Hash in Syft + run: | + python packages/syft/src/syft/update_commit.py packages/syft/src/syft/commit.py + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -251,35 +248,35 @@ jobs: working-directory: /tmp/digests/syft-backend run: | docker buildx imagetools create \ - -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + -t openmined/syft-backend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ $(printf 'openmined/syft-backend@sha256:%s ' *) - name: Create manifest list and push for syft-frontend working-directory: /tmp/digests/syft-frontend run: | docker buildx imagetools create \ - -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + -t openmined/syft-frontend:${{ needs.build-and-push-docker-images.outputs.server_version }} \ $(printf 'openmined/syft-frontend@sha256:%s ' *) - name: Create manifest list and push for syft-seaweedfs working-directory: /tmp/digests/syft-seaweedfs run: | docker buildx imagetools create \ - -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + -t openmined/syft-seaweedfs:${{ needs.build-and-push-docker-images.outputs.server_version }} \ $(printf 'openmined/syft-seaweedfs@sha256:%s ' *) - name: Create manifest list and push for syft-enclave-attestation working-directory: /tmp/digests/syft-enclave-attestation run: | docker buildx imagetools create \ - -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + -t openmined/syft-enclave-attestation:${{ needs.build-and-push-docker-images.outputs.server_version }} \ $(printf 'openmined/syft-enclave-attestation@sha256:%s ' *) - name: Create manifest list and push for syft client working-directory: /tmp/digests/syft run: | docker buildx imagetools create \ - -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.short_server_version }} \ + -t openmined/syft-client:${{ needs.build-and-push-docker-images.outputs.server_version }} \ $(printf 'openmined/syft-client@sha256:%s ' *) deploy-syft: @@ -321,6 +318,10 @@ jobs: run: | python scripts/bump_version.py --bump-to-stable ${{ needs.merge-docker-images.outputs.server_version }} + - name: Update Commit Hash in Syft + run: | + python packages/syft/src/syft/update_commit.py packages/syft/src/syft/commit.py + - name: Build Helm Chart shell: bash run: | diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py index aa5128b7604..c812bf14931 100644 --- a/packages/syft/src/syft/__init__.py +++ b/packages/syft/src/syft/__init__.py @@ -26,6 +26,7 @@ from .client.syncing import sync from .client.user_settings import UserSettings from .client.user_settings import settings +from .commit import __commit__ from .custom_worker.config import DockerWorkerConfig from .custom_worker.config import PrebuiltWorkerConfig from .orchestra import Orchestra as orchestra diff --git a/packages/syft/src/syft/commit.py b/packages/syft/src/syft/commit.py new file mode 100644 index 00000000000..b65cdae6b33 --- /dev/null +++ b/packages/syft/src/syft/commit.py @@ -0,0 +1,3 @@ +# Used to store the commit hash of the syft package +# Currently only used for experimental releases +__commit__ = "GIT_COMMIT_HASH" diff --git a/packages/syft/src/syft/update_commit.py b/packages/syft/src/syft/update_commit.py new file mode 100644 index 00000000000..2daf88f98b1 --- /dev/null +++ b/packages/syft/src/syft/update_commit.py @@ -0,0 +1,48 @@ +# update_commit.py +# stdlib +import os +import subprocess +import sys + + +def get_commit_hash() -> str: + cwd = os.path.dirname(os.path.abspath(__file__)) + try: + output = subprocess.check_output( + "git rev-parse --short HEAD".split(" "), cwd=cwd + ) + return output.strip().decode("ascii") + except subprocess.CalledProcessError as e: + print(f"Error getting commit hash: {e}") + sys.exit(1) + + +def update_commit_variable(file_path: str, commit_hash: str) -> None: + """Replace the __commit__ variable with the actual commit hash.""" + try: + with open(file_path) as file: + lines = file.readlines() + + with open(file_path, "w") as file: + updated = False + for line in lines: + if "__commit__=" in line: + file.write(f'__commit__="{commit_hash}"\n') + updated = True + else: + file.write(line) + if not updated: + print("No __commit__ variable found in the file.") + except OSError as e: + print(f"Error reading or writing file: {e}") + sys.exit(1) + + +if __name__ == "__main__": + if len(sys.argv) != 2: + print("Usage: python update_commit.py ") + sys.exit(1) + + file_path = sys.argv[1] + commit_hash = get_commit_hash() + update_commit_variable(file_path, commit_hash) From adefb1aa911bf17ac37ae7990ce215cebd344ffb Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:26:31 +0530 Subject: [PATCH 12/12] temporarily ignore security issue for bump script --- packages/syft/src/syft/update_commit.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/syft/src/syft/update_commit.py b/packages/syft/src/syft/update_commit.py index 2daf88f98b1..359120c37c2 100644 --- a/packages/syft/src/syft/update_commit.py +++ b/packages/syft/src/syft/update_commit.py @@ -1,7 +1,6 @@ -# update_commit.py # stdlib import os -import subprocess +import subprocess # nosec import sys @@ -9,7 +8,8 @@ def get_commit_hash() -> str: cwd = os.path.dirname(os.path.abspath(__file__)) try: output = subprocess.check_output( - "git rev-parse --short HEAD".split(" "), cwd=cwd + "git rev-parse --short HEAD".split(" "), + cwd=cwd, # nosec ) return output.strip().decode("ascii") except subprocess.CalledProcessError as e: @@ -26,8 +26,8 @@ def update_commit_variable(file_path: str, commit_hash: str) -> None: with open(file_path, "w") as file: updated = False for line in lines: - if "__commit__=" in line: - file.write(f'__commit__="{commit_hash}"\n') + if "__commit__ = " in line: + file.write(f'__commit__ = "{commit_hash}"\n') updated = True else: file.write(line)