Merge branch 'dev' into New-README-

OpenMined · Aug 3, 2022 · b028065 · b028065
2 parents 5d295b8 + 1d3267d
commit b028065
Show file tree

Hide file tree

Showing 263 changed files with 268,136 additions and 2,246 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.0-beta.31
+current_version = 0.7.0-beta.38
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -48,7 +48,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.3.4
+          DOCKER_COMPOSE_VERSION=v2.7.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 

diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -91,14 +91,14 @@ jobs:
         run: echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_ENV
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Docker
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_LOGIN }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -118,6 +118,7 @@ jobs:
           context: ./packages
           file: ./packages/grid/backend/backend.dockerfile
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_grid_backend.outputs.tags }}
           target: backend
 
@@ -136,6 +137,7 @@ jobs:
           context: ./packages/grid/frontend
           file: ./packages/grid/frontend/frontend.dockerfile
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_grid_frontend.outputs.tags }}
           target: grid-ui-production
 
@@ -154,6 +156,7 @@ jobs:
           context: ./packages/grid/vpn
           file: ./packages/grid/vpn/headscale.dockerfile
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_grid_headscale.outputs.tags }}
 
       - name: Docker meta for Grid-Tailscale
@@ -171,6 +174,7 @@ jobs:
           context: ./packages/grid/vpn
           file: ./packages/grid/vpn/tailscale.dockerfile
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_grid_tailscale.outputs.tags }}
 
       - name: Docker meta for grid-vpn-iptables
@@ -188,4 +192,5 @@ jobs:
           context: ./packages/grid/vpn
           file: ./packages/grid/vpn/iptables.dockerfile
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta_grid_vpn_iptables.outputs.tags }}
diff --git a/.github/workflows/hagrid-pr_tests.yml b/.github/workflows/hagrid-pr_tests.yml
@@ -170,3 +170,8 @@ jobs:
         if: steps.changes.outputs.hagrid == 'true'
         run: |
           hagrid debug
+
+      - name: Run hagrid quickstart
+        if: steps.changes.outputs.hagrid == 'true'
+        run: |
+          hagrid quickstart --reset --quiet
diff --git a/.github/workflows/nightlies-run.yml b/.github/workflows/nightlies-run.yml
@@ -109,7 +109,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.3.4
+          DOCKER_COMPOSE_VERSION=v2.7.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
 

diff --git a/.github/workflows/stack-integration-public_tests.yml b/.github/workflows/stack-integration-public_tests.yml
@@ -54,7 +54,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.docker/cli-plugins
-          DOCKER_COMPOSE_VERSION=v2.3.4
+          DOCKER_COMPOSE_VERSION=v2.7.0
           curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose