Merge branch 'dev' into tauquir/enclave-prototype

OpenMined · Jul 23, 2024 · 8ba8c7d · 8ba8c7d
2 parents 0c8356d + 51d6779
commit 8ba8c7d
Show file tree

Hide file tree

Showing 19 changed files with 190 additions and 122 deletions.
diff --git 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/.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
@@ -47,10 +42,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 +73,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
@@ -104,12 +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.events.inputs.release_id}}.$(git rev-parse --short ${{ github.sha }})" >> $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
 
@@ -319,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/.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/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
@@ -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
@@ -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
@@ -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
@@ -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",