Skip to content

Commit

Permalink
Merge pull request OpenMined#9101 from OpenMined/rasswanth/fix-arm64-…
Browse files Browse the repository at this point in the history
…install

Shift CD to setup python
  • Loading branch information
rasswanth-s authored Jul 30, 2024
2 parents 72dcc96 + 91d93dc commit 75e5099
Show file tree
Hide file tree
Showing 16 changed files with 130 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.9.0-beta.2
current_version = 0.9.0-beta.3
tag = False
tag_name = {new_version}
commit = True
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/cd-feature-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,11 @@ jobs:
server_version: ${{ steps.release_metadata.outputs.server_version }}

steps:
# actions/setup-python doesn't yet support ARM
- name: Setup Python on x64
if: ${{ !endsWith(matrix.runner, '-arm64') }}
- name: Setup Python on ${{ matrix.runner }}
uses: actions/setup-python@v5
with:
python-version: "3.12"

# Currently psutil package requires gcc to be installed on arm
# for building psutil from source
# as linux/aarch64 wheels not avaialble for psutil
# We could remove once we have aarch64 wheels
# https://github.com/giampaolo/psutil/issues/1972
- name: Install Metadata packages for arm64
if: ${{ endsWith(matrix.runner, '-arm64') }}
run: |
sudo apt update -y
sudo apt install software-properties-common -y
sudo apt install gcc curl -y
sudo apt-get install python3-dev -y
- name: Setup Python on arm64
if: ${{ endsWith(matrix.runner, '-arm64') }}
uses: deadsnakes/[email protected]
with:
python-version: "3.12"

- name: Install Git
run: |
sudo apt-get update
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,32 +95,11 @@ jobs:
steps:
- uses: actions/checkout@v4

# actions/setup-python doesn't yet support ARM
- name: Setup Python on x64
if: ${{ !endsWith(matrix.runner, '-arm64') }}
- name: Setup Python on ${{ matrix.runner }}
uses: actions/setup-python@v5
with:
python-version: "3.12"

# Currently psutil package requires gcc to be installed on arm
# for building psutil from source
# as linux/aarch64 wheels not avaialble for psutil
# We could remove once we have aarch64 wheels
# https://github.com/giampaolo/psutil/issues/1972
- name: Install Metadata packages for arm64
if: ${{ endsWith(matrix.runner, '-arm64') }}
run: |
sudo apt update -y
sudo apt install software-properties-common -y
sudo apt install gcc curl -y
sudo apt-get install python3-dev -y
- name: Setup Python on arm64
if: ${{ endsWith(matrix.runner, '-arm64') }}
uses: deadsnakes/[email protected]
with:
python-version: "3.12"

- name: Install Git
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.9.0-beta.2"
__version__ = "0.9.0-beta.3"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.9.0-beta.2"
__version__ = "0.9.0-beta.3"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/backend/grid/images/worker_cpu.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-beta.2"
ARG SYFT_VERSION_TAG="0.9.0-beta.3"
FROM openmined/syft-backend:${SYFT_VERSION_TAG}

# should match base image python version
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0-beta.2"
VERSION: "0.9.0-beta.3"
PLATFORM: $(uname -m | grep -q 'arm64' && echo "arm64" || echo "amd64")

# This is a list of `images` that DevSpace can build for this project
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "syft-ui",
"version": "0.9.0-beta.2",
"version": "0.9.0-beta.3",
"private": true,
"scripts": {
"dev": "pnpm i && vite dev --host --port 80",
Expand Down
Loading

0 comments on commit 75e5099

Please sign in to comment.