test build on gha-sat

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

@@ -18,10 +18,6 @@ inputs:
     required: false
     type: boolean
     default: false
-  USE_NEXT:
-    required: false
-    type: boolean
-    default: false
   SATELLITE_NAME:
     required: false
     type: string
@@ -71,26 +67,17 @@ runs:
       shell: bash
     - run: |-
         echo "Extracting earthly binary from stage1 of build"
-        export TAG=${GITHUB_SHA}-ubuntu-latest-${{inputs.BINARY}}
-        if [ "${{inputs.USE_NEXT}}" = "true" ]; then export TAG="$TAG-ticktock"; fi
-        BUILDKITD_IMAGE=docker.io/earthly/buildkitd-staging ${{inputs.SUDO}} ./earthly upgrade
+        BUILDKITD_IMAGE=docker.io/earthly/buildkitd-staging TAG=${GITHUB_SHA}-gha-sh-1-${{inputs.BINARY}} ${{inputs.SUDO}} ./earthly upgrade
+        echo "${{inputs.SUDO}} chown -R $USER ~/.earthly"
         ${{inputs.SUDO}} chown -R $USER ~/.earthly # restore non-sudo user ownership
         test -n "${{inputs.BUILT_EARTHLY_PATH}}" || (echo "BUILT_EARTHLY_PATH is empty" && exit 1)
         mkdir -p $(dirname "${{inputs.BUILT_EARTHLY_PATH}}")
-        ${{inputs.SUDO}} ls "${HOME}/.earthly/"
-        ${{inputs.SUDO}} mv "${HOME}/.earthly/earthly-$TAG" "${{inputs.BUILT_EARTHLY_PATH}}"
+        ${{inputs.SUDO}} mv ${HOME}/.earthly/earthly-${GITHUB_SHA}-gha-sh-1-${{inputs.BINARY}} "${{inputs.BUILT_EARTHLY_PATH}}"
         echo "extracted ${{inputs.BUILT_EARTHLY_PATH}}"
       shell: bash
-    - if: ${{ inputs.USE_NEXT == 'true' }}
-      run: |-
-        export expected_buildkit_client_sha="$(cat earthly-next | head -c 12)"
-        test -n "$expected_buildkit_client_sha" || ( echo "expected_buildkit_client_sha is empty" && exit 1)
-        (strings ${{inputs.BUILT_EARTHLY_PATH}} | grep "$expected_buildkit_client_sha" ) || ( echo "expected to find $expected_buildkit_client_sha in earthly binary" && exit 1)
-        echo "correctly found $expected_buildkit_client_sha in earthly binary; this confirms earthly-next was used"
-      shell: bash
     - run: |-
         echo "Setting up mirror credentials in .arg and .secret"
-        export earthly="${{inputs.BUILT_EARTHLY_PATH}}"
+        export earthly=${{inputs.BUILT_EARTHLY_PATH}}
         # setup secrets
         echo "DOCKERHUB_MIRROR_USER=$($earthly secret --org earthly-technologies --project core get -n dockerhub-mirror/user || kill $$)" > .secret
         echo "DOCKERHUB_MIRROR_PASS=$($earthly secret --org earthly-technologies --project core get -n dockerhub-mirror/pass || kill $$)" >> .secret

.github/workflows/build-earthly.yml

@@ -19,15 +19,11 @@ on:
         required: false
         type: boolean
         default: false
-      USE_NEXT:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
 
   build-earthly:
-    name: build (and push) earthly using ${{inputs.BINARY}} and earthly-next=${{inputs.USE_NEXT}}
+    name: build (and push) earthly using ${{inputs.BINARY}}
     if: ${{!inputs.SKIP_JOB}}
     runs-on: ${{inputs.RUNS_ON}}
     env:
@@ -37,7 +33,6 @@ jobs:
       # Used in our github action as the token - TODO: look to change it into an input
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: earthly/actions-setup@main
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -75,9 +70,6 @@ jobs:
       - name: Podman Login
         run: ${{inputs.SUDO}} ${{inputs.BINARY}} login docker.io --username "${{ secrets.DOCKERHUB_USERNAME }}" --password "${{ secrets.DOCKERHUB_TOKEN }}"
         if: inputs.BINARY == 'podman'
-      - name: Update Buildkit to earthly-next
-        if: inputs.USE_NEXT
-        run: ${{inputs.SUDO}} $(which earthly) +update-buildkit --BUILDKIT_GIT_SHA=$(cat earthly-next)
       - name: Build latest earthly using released earthly
         run: ${{inputs.SUDO}} $(which earthly) --use-inline-cache +for-linux
       - name: Earthly bootstrap using latest earthly build
@@ -87,11 +79,12 @@ jobs:
           set -euo pipefail
           EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)"
           echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV"
+          unset EARTHLY_SATELLITE
       - name: Build and push +ci-release using latest earthly build
         run: |-
-          export TAG_SUFFIX="${{inputs.RUNS_ON}}-${{inputs.BINARY}}"
-          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
+          runs_on="${{inputs.RUNS_ON}}"
+          runs_on=${runs_on//earthly-satellite#/}
+          ${{inputs.SUDO}} ./build/linux/amd64/earthly --ci --push +ci-release --TAG_SUFFIX="$runs_on-${{inputs.BINARY}}"
       - name: Buildkit logs (runs on failure)
         run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd
         if: ${{ failure() }}