ci: speed up build

.github/actions/stage2-setup/action.yml

@@ -62,7 +62,7 @@ runs:
       if: steps.fork-check.outputs.is_fork == 'true'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8
       with:
-        name: earthly-build-ubuntu-latest-${{ inputs.BINARY }}${{ inputs.USE_NEXT == 'true' && '-ticktock' || '' }}
+        name: earthly-build-ubuntu-latest${{ inputs.USE_NEXT == 'true' && '-ticktock' || '' }}
         path: ./fork-artifacts
     - name: Load buildkitd image from artifact (fork)
       if: steps.fork-check.outputs.is_fork == 'true'
@@ -160,15 +160,15 @@ runs:
       run: ${{inputs.SUDO}} apt-get update && ${{inputs.SUDO}} apt-get install -y qemu-user-static
       shell: bash
     - name: Set fixed buildkitd image for Docker 29+ (non-fork)
-      if: steps.fork-check.outputs.is_fork != 'true'
+      if: inputs.BINARY == 'docker' && steps.fork-check.outputs.is_fork != 'true'
       shell: bash
       run: |
         echo "EARTHLY_BUILDKIT_IMAGE=ghcr.io/earthbuild/earthbuild:buildkitd-v0.8.17-fix.1" >> $GITHUB_ENV
     - name: Get binary from GHCR (non-fork)
       if: steps.fork-check.outputs.is_fork != 'true'
       run: |-
         echo "Extracting earthly binary from stage1 of build"
-        export TAG=${GITHUB_SHA}-ubuntu-latest-${{inputs.BINARY}}
+        export TAG=${GITHUB_SHA}-ubuntu-latest
         if [ "${{inputs.USE_NEXT}}" = "true" ]; then export TAG="$TAG-ticktock"; fi
         ${{inputs.SUDO}} ./earthly upgrade
         ${{inputs.SUDO}} chown -R $USER ~/.earthly # restore non-sudo user ownership

.github/workflows/build-earthly.yml

@@ -44,7 +44,6 @@ jobs:
       contents: read
       packages: write
     env:
-      FORCE_COLOR: 1
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       # Use fixed buildkitd image with Docker 29+ ulimit fix until next release
       EARTHLY_BUILDKIT_IMAGE: ghcr.io/earthbuild/earthbuild:buildkitd-v0.8.17-fix.1
@@ -109,13 +108,13 @@ jobs:
       - name: Build and push +ci-release using latest earthly build
         if: github.event_name == 'push' || github.event_name == 'merge_group' || github.event.pull_request.head.repo.full_name == github.repository
         run: |-
-          export TAG_SUFFIX="${{inputs.RUNS_ON}}-${{inputs.BINARY}}"
+          export TAG_SUFFIX="${{inputs.RUNS_ON}}"
           if [ "${{inputs.USE_NEXT}}" = "true" ]; then export TAG_SUFFIX="$TAG_SUFFIX-ticktock"; fi
           ${{inputs.SUDO}} ./build/linux/amd64/earthly --ci --push --build-arg TAG_SUFFIX +ci-release
       - name: Build +ci-release using latest earthly build (fork - no push)
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
         run: |-
-          export TAG_SUFFIX="${{inputs.RUNS_ON}}-${{inputs.BINARY}}"
+          export TAG_SUFFIX="${{inputs.RUNS_ON}}"
           if [ "${{inputs.USE_NEXT}}" = "true" ]; then export TAG_SUFFIX="$TAG_SUFFIX-ticktock"; fi
           # Build ci-release (builds binary and buildkitd but doesn't push)
           ${{inputs.SUDO}} ./build/linux/amd64/earthly --ci --output --build-arg TAG_SUFFIX +ci-release
@@ -125,7 +124,7 @@ jobs:
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
         run: |-
           set -euo pipefail
-          export TAG_SUFFIX="${{inputs.RUNS_ON}}-${{inputs.BINARY}}"
+          export TAG_SUFFIX="${{inputs.RUNS_ON}}"
           if [ "${{inputs.USE_NEXT}}" = "true" ]; then export TAG_SUFFIX="$TAG_SUFFIX-ticktock"; fi
 
           mkdir -p ./artifacts
@@ -150,7 +149,7 @@ jobs:
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7
         with:
-          name: earthly-build-${{inputs.RUNS_ON}}-${{inputs.BINARY}}${{ inputs.USE_NEXT && '-ticktock' || '' }}
+          name: earthly-build-${{inputs.RUNS_ON}}${{ inputs.USE_NEXT && '-ticktock' || '' }}
           path: ./artifacts/
           retention-days: 1
       - name: Buildkit logs (runs on failure)