Skip to content

Commit

Permalink
Merge branch 'dev' into peer-managing-api
Browse files Browse the repository at this point in the history
  • Loading branch information
khoaguin committed Apr 9, 2024
2 parents 0bc9757 + 553cad9 commit 41310c5
Show file tree
Hide file tree
Showing 43 changed files with 111 additions and 5,917 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/cd-syft-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,6 @@ jobs:
${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:dev-${{ github.sha }}
${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:${{ steps.grid.outputs.GRID_VERSION }}
- name: Build and push `grid-veilid` image to registry
uses: docker/build-push-action@v5
with:
context: ./packages/grid/veilid
file: ./packages/grid/veilid/veilid.dockerfile
push: true
tags: |
${{ secrets.ACR_SERVER }}/openmined/grid-veilid:dev
${{ secrets.ACR_SERVER }}/openmined/grid-veilid:dev-${{ github.sha }}
${{ secrets.ACR_SERVER }}/openmined/grid-veilid:${{ steps.grid.outputs.GRID_VERSION }}
- name: Build Helm Chart & Copy to infra
if: github.ref == 'refs/heads/dev' || github.event.inputs.deploy-helm == 'true'
shell: bash
Expand Down
27 changes: 1 addition & 26 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,24 +248,7 @@ jobs:
digest="${{ steps.grid-seaweedfs-build.outputs.digest }}"
touch "/tmp/digests/grid-seaweedfs/${digest#sha256:}"
- name: Build and push `grid-veilid` image to DockerHub
id: grid-veilid-build
uses: docker/build-push-action@v5
with:
context: ./packages/grid/veilid
file: ./packages/grid/veilid/veilid.dockerfile
platforms: ${{ steps.release_metadata.outputs.release_platform }}
outputs: type=image,name=openmined/grid-veilid,push-by-digest=true,name-canonical=true,push=true
cache-from: type=registry,ref=openmined/grid-veilid:cache-${{ steps.release_metadata.outputs.short_release_platform }}
cache-to: type=registry,ref=openmined/grid-veilid:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max

- name: Export digest for grid-veilid
run: |
mkdir -p /tmp/digests/grid-veilid
digest="${{ steps.grid-veilid-build.outputs.digest }}"
touch "/tmp/digests/grid-veilid/${digest#sha256:}"
- name: Upload digest for grid-backend, grid-frontend and grid-seaweedfs, grid-veilid
- name: Upload digest for grid-backend, grid-frontend and grid-seaweedfs
uses: actions/upload-artifact@v4
with:
name: digests-${{ steps.release_metadata.outputs.grid_version }}-${{ steps.release_metadata.outputs.short_release_platform }}
Expand Down Expand Up @@ -324,14 +307,6 @@ jobs:
-t openmined/grid-seaweedfs:${{ needs.build-and-push-docker-images.outputs.release_tag }} \
$(printf 'openmined/grid-seaweedfs@sha256:%s ' *)
- name: Create manifest list and push for grid-veilid
working-directory: /tmp/digests/grid-veilid
run: |
docker buildx imagetools create \
-t openmined/grid-veilid:${{ needs.build-and-push-docker-images.outputs.grid_version }} \
-t openmined/grid-veilid:${{ needs.build-and-push-docker-images.outputs.release_tag }} \
$(printf 'openmined/grid-veilid@sha256:%s ' *)
deploy-syft:
needs: [merge-docker-images]
if: always() && needs.merge-docker-images.result == 'success'
Expand Down
281 changes: 0 additions & 281 deletions notebooks/Testing/Veilid/Alice-Python-Server.ipynb

This file was deleted.

Loading

0 comments on commit 41310c5

Please sign in to comment.