release: v1.5.0

apollographql · Dec 6, 2022 · ff9bfba · ff9bfba
2 parents 518efbe + 5839fce
commit ff9bfba
Show file tree

Hide file tree

Showing 124 changed files with 12,890 additions and 1,752 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -1,2 +1,2 @@
 [alias]
-xtask = "run --locked --package xtask --"
+xtask = "run --locked --package xtask --manifest-path xtask/Cargo.toml --"
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -175,6 +175,11 @@ commands:
           command: |
             set -e -o pipefail
             cargo about --version || cargo install cargo-about
+      - run:
+          name: Install cargo edit if not present
+          command: |
+            set -e -o pipefail
+            cargo edit --version || cargo install cargo-edit
       - save_cache:
           key: rust-<< pipeline.parameters.cache_version >>-extra-tools-<< parameters.os >>
           paths:
@@ -486,16 +491,17 @@ jobs:
           name: Docker build
           command: |
             ROUTER_TAG=ghcr.io/apollographql/router
-            # Build debug image
-            docker build --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION}-debug .
-            # Build release image
-            docker build --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION} .
+            # Create a multi-arch builder which works properly under qemu
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            docker context create buildx-build
+            docker buildx create --driver docker-container --use buildx-build
+            docker buildx inspect --bootstrap
             # Note: GH Token owned by apollo-bot2, no expire
             echo ${GITHUB_OCI_TOKEN} | docker login ghcr.io -u apollo-bot2 --password-stdin
-            # Push debug image
-            docker push ${ROUTER_TAG}:${VERSION}-debug
-            # Push release image
-            docker push ${ROUTER_TAG}:${VERSION}
+            # Build and push debug image
+            docker buildx build --platform linux/amd64,linux/arm64 --push --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION}-debug .
+            # Build and push release image
+            docker buildx build --platform linux/amd64,linux/arm64 --push --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION} .
       - run:
           name: Helm build
           command: |
@@ -510,6 +516,23 @@ jobs:
             # Push chart to repository
             helm push ${CHART} oci://ghcr.io/apollographql/helm-charts
 
+  prepare_release:
+    parameters:
+      release_type:
+        type: string
+    docker:
+      - image: cimg/base:stable
+    resource_class: small
+    steps:
+      - checkout
+      - gh/setup
+      - linux_install_baseline
+      - install_extra_tools:
+          os: linux_amd
+      - run:
+          command: >
+            cargo xtask release prepare << parameters.release_type >>
+
 workflows:
   ci_checks:
     jobs:
@@ -538,6 +561,43 @@ workflows:
             parameters:
               platform:
                 [macos_test, windows_test, amd_linux_test, arm_linux_test]
+      - prepare_major_release_approval:
+          type: approval
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - dev
+      - prepare_minor_release_approval:
+          type: approval
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - dev
+      - prepare_patch_release_approval:
+          type: approval
+          requires:
+            - test
+          filters:
+            branches:
+              only:
+                - dev
+      - prepare_release:
+          release_type: "major"
+          requires:
+            - prepare_major_release_approval
+      - prepare_release:
+          release_type: "minor"
+          requires:
+            - prepare_minor_release_approval
+      - prepare_release:
+          release_type: "patch"
+          requires:
+            - prepare_patch_release_approval
+
   release:
     jobs:
       - build_release: