Use two stage release process, plus diamond workflow for cross-compiling

.github/workflows/release.yml

@@ -1,50 +1,113 @@
-name: Release
+name: Release From Branch
 
 env:
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 on:
   workflow_dispatch:
     inputs:
-      increment:
-        description: "SemVer Increment"
-        required: true
-        default: "prerelease"
-        type: choice
-        options:
-          - prerelease
-          - prepatch
-          - preminor
-          - premajor
-          - patch
-          - minor
-          - major
+      release_branch:
+        description: "Staging branch to run release from"
+
 jobs:
-  build:
-    runs-on: macos-latest
+  smoke-test:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{ secrets.TURBOBOT }}
+          ref: ${{ inputs.release_branch }}
       - uses: ./.github/actions/setup-node
         with:
           enable-corepack: false
       - uses: ./.github/actions/setup-go
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Test
+        run: pnpm -- turbo run test --filter=cli --color
 
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+  darwin:
+    name: "Build Darwin Binares"
+    needs: [smoke-test]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.release_branch }}
+      - run: git fetch origin --tags
+      - uses: ./.github/actions/setup-node
         with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          enable-corepack: false
+      - uses: ./.github/actions/setup-go
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v3
+        with:
+          distribution: goreleaser-pro
           version: latest
+          install-only: true
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - name: Build Artifacts
+        run: cd cli && make publish-turbo-darwin
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: turbo-artifacts-darwin
+          path: cli/dist-darwin
 
-          # Optional: working directory, useful for monorepos
-          working-directory: cli
+  # compiles linux and windows in a container
+  cross:
+    name: "Build Linux and Windows Binaries"
+    needs: [smoke-test]
+    runs-on: ubuntu-latest
+    container:
+      image: docker://ghcr.io/vercel/turbo-cross:v1.18.5
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: "${{ inputs.release_branch }}"
+      - run: git fetch origin --tags
+      - uses: ./.github/actions/setup-node
+        with:
+          enable-corepack: false
+      - uses: ./.github/actions/setup-go
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Install GoReleaser
+        uses: goreleaser/goreleaser-action@v3
+        with:
+          distribution: goreleaser-pro
+          version: latest
+          install-only: true
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - name: Build Artifacts
+        run: cd cli && make publish-turbo-cross
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: turbo-artifacts-cross
+          path: cli/dist-cross
 
-          # `golangci-lint-action` does not have an "install only" option.
-          # We ignore the output of this run, instead using it just to install the binary.
-          args: --issues-exit-code=0
+  final-publish:
+    needs: [cross, darwin]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: "${{ inputs.release_branch }}"
+      - run: git fetch origin --tags
+      - uses: ./.github/actions/setup-node
+        with:
+          enable-corepack: false
+      - uses: ./.github/actions/setup-go
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Configure git
         run: |
@@ -60,12 +123,38 @@ jobs:
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 
-      - name: Version
-        run: |
-          ./scripts/version.js ${{ inputs.increment }}
-          cat version.txt
+      # Download the prebuilt binaries for each platform,
+      # combine them into a single dist-combined folder,
+      # then delegate to goreleaser / Makefile for deploy.
+      # Finally, set up a PR for the branch we released off of
+      - name: Download Cross-compiled Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: turbo-artifacts-cross
+          path: cli/dist-cross
+
+      - name: Download Darwin Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: turbo-artifacts-darwin
+          path: cli/dist-darwin
+
+      - name: Combine Artifacts
+        run: cd cli && mkdir -p dist-combined && cp -a dist-cross/. dist-combined/ && cp -a dist-darwin/. dist-combined/
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 
       - name: Release
         run: cd cli && make publish
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+
+      - uses: repo-sync/pull-request@v2
+        with:
+          source_branch: ${{ inputs.release_branch }}
+          destination_branch: main
+          pr_title: Merge release branch ${{ inputs.release_branch }}
+          pr_body: ":crown: Merge release branch back to main"
+          pr_reviewer: ${{ github.actor }},gsoltis
+          pr_allow_empty: true
+          github_token: ${{ secrets.TURBOBOT }}

.github/workflows/stage.yml

@@ -0,0 +1,43 @@
+name: Create Release Branch
+
+# TODO: Once we have confidence with the release process, add an
+# input to allow automatically kicking off the downstream release.
+on:
+  workflow_dispatch:
+    inputs:
+      increment:
+        description: "SemVer Increment (prerelease = bump canary)"
+        required: true
+        default: "prerelease"
+        type: choice
+        options:
+          - prerelease
+          - prepatch
+          - preminor
+          - premajor
+          - patch
+          - minor
+          - major
+
+jobs:
+  stage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.TURBOBOT }}
+      - uses: ./.github/actions/setup-node
+        with:
+          enable-corepack: false
+      - name: Configure git
+        run: |
+          git config --global user.name 'Turbobot'
+          git config --global user.email 'turbobot@vercel.com'
+      - name: Version
+        run: |
+          ./scripts/version.js ${{ inputs.increment }}
+          cat version.txt
+      - name: Stage Commit
+        run: cd cli && make stage-release && echo "STAGE_BRANCH=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Show Stage Commit
+        run: echo "${{ env.STAGE_BRANCH }}"

cli/.gitignore

@@ -2,6 +2,7 @@
 
 /demo/
 /dist/
+/dist-*
 
 # Built binaries.
 /turbo