From 403e9204a88b8d69ec8732b8e3d89df84eab844d Mon Sep 17 00:00:00 2001 From: Kieran Mann Date: Fri, 3 Jul 2026 09:43:30 -0700 Subject: [PATCH] ci: rename CI-internal workflow inputs to *_EARTHBUILD_* Renames two GitHub Actions inputs that are purely CI-internal plumbing: BUILT_EARTHLY_PATH -> BUILT_EARTHBUILD_PATH RUN_EARTHLY_TEST_ARGS -> RUN_EARTHBUILD_TEST_ARGS These are reusable-workflow / composite-action inputs (the path to the built binary and extra test CLI args). Renamed consistently across every declaration (`inputs:`), consumer (`${{ inputs.* }}`), and caller (`with:`) in .github. They have no consumers outside .github and are not read by the earthly binary, so behavior is unchanged. Left untouched: real env vars read by the tool (EARTHLY_VERSION_FLAG_OVERRIDES, EARTHLY_TOKEN, EARTHLY_ORG, EARTHLY_INSTALL_ID, EARTHLY_BUILDKIT_IMAGE, ...) and binary-path values like "./build/linux/amd64/earthly". All changed workflow YAML parses. Reduces "earthly" line count by 65. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/actions/stage2-setup/action.yml | 26 ++--- .github/workflows/build-earthly.yml | 2 +- .github/workflows/ci-docker-ubuntu.yml | 94 +++++++++---------- .../ci-earthly-next-docker-ubuntu.yml | 26 ++--- .github/workflows/ci-podman-ubuntu.yml | 60 ++++++------ .github/workflows/ci-scheduled-podman-mac.yml | 10 +- .github/workflows/ci-staging-deploy.yml | 2 +- .../reusable-bootstrap-integrations.yml | 4 +- .../reusable-docker-build-integrations.yml | 6 +- .../reusable-earthbuild-image-tests.yml | 6 +- .github/workflows/reusable-example.yml | 10 +- .github/workflows/reusable-export-test.yml | 6 +- .../workflows/reusable-git-metadata-test.yml | 6 +- .github/workflows/reusable-misc-tests-1.yml | 10 +- .github/workflows/reusable-misc-tests-2.yml | 12 +-- .../workflows/reusable-push-integrations.yml | 6 +- .github/workflows/reusable-race-test.yml | 6 +- .../workflows/reusable-repo-auth-tests.yml | 12 +-- .../reusable-secrets-integrations.yml | 6 +- .github/workflows/reusable-test-local.yml | 12 +-- .github/workflows/reusable-test.yml | 8 +- .../workflows/reusable-wait-block-main.yml | 4 +- .../workflows/reusable-wait-block-target.yml | 6 +- 23 files changed, 170 insertions(+), 170 deletions(-) diff --git a/.github/actions/stage2-setup/action.yml b/.github/actions/stage2-setup/action.yml index a74bac6951..1f10f1eafa 100644 --- a/.github/actions/stage2-setup/action.yml +++ b/.github/actions/stage2-setup/action.yml @@ -5,7 +5,7 @@ inputs: description: 'The earthly version to use' required: false default: 'latest' - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: description: "Path to the built earthly binary" required: true BINARY: @@ -75,11 +75,11 @@ runs: if: steps.fork-check.outputs.is_fork == 'true' shell: bash run: | - test -n "${{inputs.BUILT_EARTHLY_PATH}}" || (echo "BUILT_EARTHLY_PATH is empty" && exit 1) - mkdir -p $(dirname "${{inputs.BUILT_EARTHLY_PATH}}") - cp ./fork-artifacts/earthly "${{inputs.BUILT_EARTHLY_PATH}}" - chmod +x "${{inputs.BUILT_EARTHLY_PATH}}" - echo "Earthly binary installed from artifact to ${{inputs.BUILT_EARTHLY_PATH}}" + test -n "${{inputs.BUILT_EARTHBUILD_PATH}}" || (echo "BUILT_EARTHBUILD_PATH is empty" && exit 1) + mkdir -p $(dirname "${{inputs.BUILT_EARTHBUILD_PATH}}") + cp ./fork-artifacts/earthly "${{inputs.BUILT_EARTHBUILD_PATH}}" + chmod +x "${{inputs.BUILT_EARTHBUILD_PATH}}" + echo "Earthly binary installed from artifact to ${{inputs.BUILT_EARTHBUILD_PATH}}" # Read the tag suffix and set EARTHLY_BUILDKIT_IMAGE env var for subsequent steps TAG_SUFFIX=$(cat ./fork-artifacts/tag-suffix.txt) @@ -172,26 +172,26 @@ runs: 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 - test -n "${{inputs.BUILT_EARTHLY_PATH}}" || (echo "BUILT_EARTHLY_PATH is empty" && exit 1) - mkdir -p $(dirname "${{inputs.BUILT_EARTHLY_PATH}}") + test -n "${{inputs.BUILT_EARTHBUILD_PATH}}" || (echo "BUILT_EARTHBUILD_PATH is empty" && exit 1) + mkdir -p $(dirname "${{inputs.BUILT_EARTHBUILD_PATH}}") ${{inputs.SUDO}} ls "${HOME}/.earthly/" - ${{inputs.SUDO}} mv "${HOME}/.earthly/earthly-$TAG" "${{inputs.BUILT_EARTHLY_PATH}}" - echo "extracted ${{inputs.BUILT_EARTHLY_PATH}}" + ${{inputs.SUDO}} mv "${HOME}/.earthly/earthly-$TAG" "${{inputs.BUILT_EARTHBUILD_PATH}}" + echo "extracted ${{inputs.BUILT_EARTHBUILD_PATH}}" shell: bash - run: |- echo "Configuring earthbuild to use GCR mirror" - ${{inputs.BUILT_EARTHLY_PATH}} config global.buildkit_additional_config "'[registry.\"docker.io\"] + ${{inputs.BUILT_EARTHBUILD_PATH}} config global.buildkit_additional_config "'[registry.\"docker.io\"] mirrors = [\"mirror.gcr.io\", \"public.ecr.aws\"]'" 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) + (strings ${{inputs.BUILT_EARTHBUILD_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 - if: ${{ inputs.BINARY == 'podman' }} - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} bootstrap + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} bootstrap shell: bash - run: echo "stage2-setup action complete" shell: bash diff --git a/.github/workflows/build-earthly.yml b/.github/workflows/build-earthly.yml index 1c5f56c4c0..b29e64fade 100644 --- a/.github/workflows/build-earthly.yml +++ b/.github/workflows/build-earthly.yml @@ -3,7 +3,7 @@ name: Earthly Build on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: diff --git a/.github/workflows/ci-docker-ubuntu.yml b/.github/workflows/ci-docker-ubuntu.yml index bcdca83329..d456895221 100644 --- a/.github/workflows/ci-docker-ubuntu.yml +++ b/.github/workflows/ci-docker-ubuntu.yml @@ -29,7 +29,7 @@ jobs: packages: write uses: ./.github/workflows/build-earthly.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -42,7 +42,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-misc" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -56,7 +56,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group1" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -70,7 +70,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group2" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -84,7 +84,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group3" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -98,7 +98,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group4" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -112,7 +112,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group5" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -126,7 +126,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group6" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -140,7 +140,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group7" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -154,7 +154,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group8" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -168,7 +168,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group9" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -182,7 +182,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group10" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -196,7 +196,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group11" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -210,7 +210,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group12" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -224,7 +224,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-slow" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -238,7 +238,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-kind" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-24.04" BINARY: "docker" SUDO: "" @@ -255,7 +255,7 @@ jobs: # uses: ./.github/workflows/reusable-test.yml # with: # TEST_TARGET: "./tests/oidc+test" - # BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + # BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "docker" # SUDO: "" @@ -270,7 +270,7 @@ jobs: with: TEST_TARGET: "+test-qemu" USE_QEMU: true - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -283,7 +283,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -296,7 +296,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -309,7 +309,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -322,7 +322,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -336,7 +336,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -349,7 +349,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-test-local.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" BINARY_COMPOSE: "\"docker compose\"" @@ -362,7 +362,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-push-integrations.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -374,7 +374,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-bootstrap-integrations.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -386,7 +386,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-repo-auth-tests.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -398,7 +398,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-export-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -410,7 +410,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-docker-build-integrations.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -422,7 +422,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-earthbuild-image-tests.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -434,7 +434,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-misc-tests-1.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -446,7 +446,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-misc-tests-2.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -458,7 +458,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-main.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -470,7 +470,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -484,7 +484,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -498,7 +498,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -512,7 +512,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -526,7 +526,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -540,7 +540,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -554,7 +554,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -568,7 +568,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-git-metadata-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" @@ -580,7 +580,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-misc" RUNS_ON: "ubuntu-latest" USE_QEMU: false @@ -595,7 +595,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-no-qemu-group1" RUNS_ON: "ubuntu-latest" USE_QEMU: false @@ -610,7 +610,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-no-qemu-group2" RUNS_ON: "ubuntu-latest" USE_QEMU: false @@ -625,7 +625,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-no-qemu-group3" RUNS_ON: "ubuntu-latest" USE_QEMU: false @@ -640,7 +640,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-no-qemu-group4" RUNS_ON: "ubuntu-latest" USE_QEMU: false @@ -655,7 +655,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-race-test.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" TEST_TARGET: "+test-no-qemu-slow" RUNS_ON: "ubuntu-latest" USE_QEMU: false diff --git a/.github/workflows/ci-earthly-next-docker-ubuntu.yml b/.github/workflows/ci-earthly-next-docker-ubuntu.yml index c43ec86416..efad5152f5 100644 --- a/.github/workflows/ci-earthly-next-docker-ubuntu.yml +++ b/.github/workflows/ci-earthly-next-docker-ubuntu.yml @@ -17,7 +17,7 @@ jobs: packages: write uses: ./.github/workflows/build-earthly.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -29,7 +29,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group1" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -43,7 +43,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group2" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -57,7 +57,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group3" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -71,7 +71,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group4" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -85,7 +85,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group5" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -99,7 +99,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group6" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -113,7 +113,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group7" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -127,7 +127,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group8" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -141,7 +141,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group9" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -155,7 +155,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group10" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -169,7 +169,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group11" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true @@ -183,7 +183,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group12" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" USE_NEXT: true diff --git a/.github/workflows/ci-podman-ubuntu.yml b/.github/workflows/ci-podman-ubuntu.yml index f98619c57e..236f445954 100644 --- a/.github/workflows/ci-podman-ubuntu.yml +++ b/.github/workflows/ci-podman-ubuntu.yml @@ -30,7 +30,7 @@ jobs: packages: write uses: ./.github/workflows/build-earthly.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -43,7 +43,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-misc" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -56,7 +56,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group1" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -69,7 +69,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group2" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -82,7 +82,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group3" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -95,7 +95,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group4" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -108,7 +108,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group5" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -121,7 +121,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group6" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -134,7 +134,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group7" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -147,7 +147,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group8" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -160,7 +160,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group9" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -173,7 +173,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group10" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -186,7 +186,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group11" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -199,7 +199,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-group12" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -212,7 +212,7 @@ jobs: uses: ./.github/workflows/reusable-test.yml with: TEST_TARGET: "+test-no-qemu-slow" - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -226,7 +226,7 @@ jobs: # uses: ./.github/workflows/reusable-test.yml # with: # TEST_TARGET: "./tests/oidc+test" - # BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + # BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -240,7 +240,7 @@ jobs: with: TEST_TARGET: "+test-qemu" USE_QEMU: true - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" SUDO: "sudo -E" @@ -253,7 +253,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" USE_QEMU: true @@ -268,7 +268,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" USE_QEMU: true @@ -283,7 +283,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" USE_QEMU: true @@ -298,7 +298,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" USE_QEMU: true @@ -314,7 +314,7 @@ jobs: if: ${{ !failure() }} uses: ./.github/workflows/reusable-example.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" USE_QEMU: true @@ -329,7 +329,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-test-local.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # BINARY_COMPOSE: "\"sudo -E podman-compose\"" @@ -344,7 +344,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-push-integrations.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -357,7 +357,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-bootstrap-integrations.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -370,7 +370,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-repo-auth-tests.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -383,7 +383,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-export-test.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -396,7 +396,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-earthbuild-image-tests.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -409,7 +409,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-misc-tests-1.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" @@ -422,7 +422,7 @@ jobs: # if: ${{ !failure() }} # uses: ./.github/workflows/reusable-misc-tests-2.yml # with: -# BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" +# BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" # RUNS_ON: "ubuntu-latest" # BINARY: "podman" # SUDO: "sudo -E" diff --git a/.github/workflows/ci-scheduled-podman-mac.yml b/.github/workflows/ci-scheduled-podman-mac.yml index a45e3053e8..7724508538 100644 --- a/.github/workflows/ci-scheduled-podman-mac.yml +++ b/.github/workflows/ci-scheduled-podman-mac.yml @@ -18,7 +18,7 @@ jobs: env: FORCE_COLOR: 1 EARTHLY_INSTALL_ID: "earthly-githubactions" - BUILT_EARTHLY_PATH: build/darwin/amd64/earthly + BUILT_EARTHBUILD_PATH: build/darwin/amd64/earthly # Used in our github action as the token - TODO: look to change it into an input GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -62,9 +62,9 @@ jobs: - name: Build latest earth using released earth run: earth -P --use-inline-cache +for-darwin - name: Re-bootstrap Earthly using latest earthly build - run: ${{ env.BUILT_EARTHLY_PATH }} bootstrap + run: ${{ env.BUILT_EARTHBUILD_PATH }} bootstrap - name: rebuild earthly using latest earthly build - run: ${{ env.BUILT_EARTHLY_PATH }} -P --use-inline-cache +for-darwin + run: ${{ env.BUILT_EARTHBUILD_PATH }} -P --use-inline-cache +for-darwin - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env run: |- set -euo pipefail @@ -72,10 +72,10 @@ jobs: echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" # Note - we only run the non-qemu tests here because we have not figured out cross-compilation on Mac using Podman yet - name: Execute tests-no-qemu - run: ${{env.BUILT_EARTHLY_PATH}} --ci -P +test-no-qemu + run: ${{env.BUILT_EARTHBUILD_PATH}} --ci -P +test-no-qemu if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Execute fail test - run: "! ${{ env.BUILT_EARTHLY_PATH }} --ci ./tests/fail+test-fail" + run: "! ${{ env.BUILT_EARTHBUILD_PATH }} --ci ./tests/fail+test-fail" - name: Buildkit logs (runs on failure) run: podman logs earthly-buildkitd if: ${{ failure() }} diff --git a/.github/workflows/ci-staging-deploy.yml b/.github/workflows/ci-staging-deploy.yml index cfbedfc0d3..d27dd592cf 100644 --- a/.github/workflows/ci-staging-deploy.yml +++ b/.github/workflows/ci-staging-deploy.yml @@ -27,7 +27,7 @@ jobs: packages: write uses: ./.github/workflows/build-earthly.yml with: - BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" + BUILT_EARTHBUILD_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" SUDO: "" diff --git a/.github/workflows/reusable-bootstrap-integrations.yml b/.github/workflows/reusable-bootstrap-integrations.yml index e0de602dc1..a15c654a7a 100644 --- a/.github/workflows/reusable-bootstrap-integrations.yml +++ b/.github/workflows/reusable-bootstrap-integrations.yml @@ -3,7 +3,7 @@ name: Bootstrap Integrations on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -48,7 +48,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env diff --git a/.github/workflows/reusable-docker-build-integrations.yml b/.github/workflows/reusable-docker-build-integrations.yml index 83ba6f754f..c735609e07 100644 --- a/.github/workflows/reusable-docker-build-integrations.yml +++ b/.github/workflows/reusable-docker-build-integrations.yml @@ -3,7 +3,7 @@ name: docker-build Integrations on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -52,7 +52,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -61,7 +61,7 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: run docker-build-integration - run: ${{inputs.SUDO}} env earthly=${{inputs.BUILT_EARTHLY_PATH}} scripts/tests/docker-build/integration.sh + run: ${{inputs.SUDO}} env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} scripts/tests/docker-build/integration.sh - name: Buildkit logs (runs on failure) if: ${{ failure() }} run: ${{inputs.SUDO}} docker logs earthly-buildkitd || true diff --git a/.github/workflows/reusable-earthbuild-image-tests.yml b/.github/workflows/reusable-earthbuild-image-tests.yml index 031a7841fc..8010d1936a 100644 --- a/.github/workflows/reusable-earthbuild-image-tests.yml +++ b/.github/workflows/reusable-earthbuild-image-tests.yml @@ -3,7 +3,7 @@ name: Earthly Image Tests on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -54,7 +54,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -63,7 +63,7 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Build the earthbuild docker image - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} +earthly-docker --TAG=image-test + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} +earthly-docker --TAG=image-test - name: "Run the earthbuild image tests" run: FRONTEND=${{inputs.BINARY}} EARTHLY_IMAGE=ghcr.io/earthbuild/earthbuild:image-test ./scripts/tests/earthly-image.sh - name: Buildkit logs (runs on failure) diff --git a/.github/workflows/reusable-example.yml b/.github/workflows/reusable-example.yml index 5e3c4c8d97..3f8cb655cc 100644 --- a/.github/workflows/reusable-example.yml +++ b/.github/workflows/reusable-example.yml @@ -3,7 +3,7 @@ name: Runs examples1 on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -66,7 +66,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" USE_QEMU: "${{ inputs.USE_QEMU }}" SUDO: "${{ inputs.SUDO }}" @@ -84,14 +84,14 @@ jobs: - name: Link Earthly dir to Earthly dev dir run: mkdir -p ~/.earthly && ln -s ~/.earthly ~/.earthly-dev - name: Build ${{inputs.EXAMPLE_NAME}} (PR build) - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci -P ${{inputs.EXAMPLE_NAME}} + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci -P ${{inputs.EXAMPLE_NAME}} if: github.event_name != 'push' - name: Build ${{inputs.EXAMPLE_NAME}} (main build) - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci --push -P ${{inputs.EXAMPLE_NAME}} + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci --push -P ${{inputs.EXAMPLE_NAME}} if: github.event_name == 'push' - name: Build and test multi-platform example run: | - ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} ./examples/multiplatform+all + ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} ./examples/multiplatform+all ${{inputs.SUDO}} ${{inputs.BINARY}} run --rm earthbuild/examples:multiplatform_linux_arm64 | grep aarch64 - name: Buildkit logs (runs on failure) if: ${{ failure() }} diff --git a/.github/workflows/reusable-export-test.yml b/.github/workflows/reusable-export-test.yml index b0002d4f4a..489febe00e 100644 --- a/.github/workflows/reusable-export-test.yml +++ b/.github/workflows/reusable-export-test.yml @@ -3,7 +3,7 @@ name: Repo Auth Tests on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -47,7 +47,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -56,7 +56,7 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: run export tests - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} frontend=${{inputs.BINARY}} scripts/tests/export.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} frontend=${{inputs.BINARY}} scripts/tests/export.sh - name: Buildkit logs (runs on failure) if: ${{ failure() }} run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd || true diff --git a/.github/workflows/reusable-git-metadata-test.yml b/.github/workflows/reusable-git-metadata-test.yml index 31b141a3ac..12abb920df 100644 --- a/.github/workflows/reusable-git-metadata-test.yml +++ b/.github/workflows/reusable-git-metadata-test.yml @@ -3,7 +3,7 @@ name: Test Earthly on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -54,7 +54,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -64,7 +64,7 @@ jobs: echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Execute git-metadata-test run: |- - ${{inputs.SUDO}} ${{ inputs.BUILT_EARTHLY_PATH }} --ci -P \ + ${{inputs.SUDO}} ${{ inputs.BUILT_EARTHBUILD_PATH }} --ci -P \ ./tests/git-metadata+test - name: Buildkit logs (runs on failure) if: ${{ failure() }} diff --git a/.github/workflows/reusable-misc-tests-1.yml b/.github/workflows/reusable-misc-tests-1.yml index e894283077..f87609ab54 100644 --- a/.github/workflows/reusable-misc-tests-1.yml +++ b/.github/workflows/reusable-misc-tests-1.yml @@ -3,7 +3,7 @@ name: Misc Tests 1 on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -54,7 +54,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -66,16 +66,16 @@ jobs: run: |- ${{inputs.SUDO}} ${{inputs.BINARY}} stop earthly-buildkitd || true && \ for i in 1 2 3 4; do - ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --no-output github.com/EarthBuild/hello-world+hello & \ + ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --no-output github.com/EarthBuild/hello-world+hello & \ pids[i]=$! done && \ for pid in "${pids[@]}"; do wait "$pid" done - name: Execute interactive debugger test - run: ./scripts/tests/interactive-debugger/test-interactive.py --earthly ${{inputs.BUILT_EARTHLY_PATH}} --timeout 180 + run: ./scripts/tests/interactive-debugger/test-interactive.py --earthly ${{inputs.BUILT_EARTHBUILD_PATH}} --timeout 180 - name: Execute version test - run: "${{inputs.BUILT_EARTHLY_PATH}} --version" + run: "${{inputs.BUILT_EARTHBUILD_PATH}} --version" - name: Execute docker2earth test run: "./tests/docker2earth/test.sh" - name: Execute remote-cache test diff --git a/.github/workflows/reusable-misc-tests-2.yml b/.github/workflows/reusable-misc-tests-2.yml index 07de0fc76f..5eb0ab2113 100644 --- a/.github/workflows/reusable-misc-tests-2.yml +++ b/.github/workflows/reusable-misc-tests-2.yml @@ -3,7 +3,7 @@ name: Misc Tests 2 on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -57,7 +57,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -66,17 +66,17 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Run linux-amd64 specific tests - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci -P ./tests+ga-linux-amd64 + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci -P ./tests+ga-linux-amd64 - name: Execute earthly ${{inputs.BINARY}} command - run: (cd tests/docker && ${{inputs.SUDO}} ../../${{inputs.BUILT_EARTHLY_PATH}} docker-build --tag examples-test-docker:latest . && diff <(docker run --rm examples-test-docker:latest) <(echo "hello dockerfile") ) + run: (cd tests/docker && ${{inputs.SUDO}} ../../${{inputs.BUILT_EARTHBUILD_PATH}} docker-build --tag examples-test-docker:latest . && diff <(docker run --rm examples-test-docker:latest) <(echo "hello dockerfile") ) - name: Execute private image test (Earthly Only) # TODO move to separate workflow - run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci ./tests+private-image-test + run: ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci ./tests+private-image-test if: github.event_name == 'push' || github.event_name == 'merge_group' || github.event.pull_request.head.repo.full_name == github.repository - name: Execute save images test run: frontend=${{inputs.BINARY}} ./tests/save-images/test.sh - name: Experimental tests run: |- - ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci -P ./tests+experimental + ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci -P ./tests+experimental - name: Test buildkit info-level logging run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd 2>&1 | grep 'running server on' - name: Buildkit logs (runs on failure) diff --git a/.github/workflows/reusable-push-integrations.yml b/.github/workflows/reusable-push-integrations.yml index a7139562ad..2f2558dc20 100644 --- a/.github/workflows/reusable-push-integrations.yml +++ b/.github/workflows/reusable-push-integrations.yml @@ -3,7 +3,7 @@ name: Push Integrations on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -53,7 +53,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -63,7 +63,7 @@ jobs: echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Push and Pull Cloud Images run: |- - ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} --ci -P \ + ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} --ci -P \ ./tests/cloud-push-pull+all - name: Push Images after RUN --push run: ${{inputs.SUDO}} frontend=${{inputs.BINARY}} ./tests/push-images/test.sh diff --git a/.github/workflows/reusable-race-test.yml b/.github/workflows/reusable-race-test.yml index 4abf80781f..22a02bf19e 100644 --- a/.github/workflows/reusable-race-test.yml +++ b/.github/workflows/reusable-race-test.yml @@ -3,7 +3,7 @@ name: Test Earthly (-race) on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -62,7 +62,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -71,7 +71,7 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Build latest earthly/buildkitd image using released earthly - run: ${{ inputs.BUILT_EARTHLY_PATH }} --use-inline-cache ./buildkitd+buildkitd --TAG=race-test + run: ${{ inputs.BUILT_EARTHBUILD_PATH }} --use-inline-cache ./buildkitd+buildkitd --TAG=race-test - name: Execute tests run: |- GORACE="halt_on_error=1" go run -race ./cmd/earthly --buildkit-image ghcr.io/earthbuild/earthbuild:buildkitd-race-test ${{inputs.EXTRA_ARGS}} -P --no-output \ diff --git a/.github/workflows/reusable-repo-auth-tests.yml b/.github/workflows/reusable-repo-auth-tests.yml index 9d830aa944..de3f3adb8a 100644 --- a/.github/workflows/reusable-repo-auth-tests.yml +++ b/.github/workflows/reusable-repo-auth-tests.yml @@ -3,7 +3,7 @@ name: Repo Auth Tests on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -55,7 +55,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Start SSHD container @@ -68,13 +68,13 @@ jobs: # to regenerate the entries below; run earthly ./scripts/tests/auth+generate-github-tasks # auto-generated-entries start; - name: run test-hello-world-no-ssh-agent.sh - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} scripts/tests/auth/test-hello-world-no-ssh-agent.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} scripts/tests/auth/test-hello-world-no-ssh-agent.sh - name: run test-hello-world-no-ssh-keys.sh - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} scripts/tests/auth/test-hello-world-no-ssh-keys.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} scripts/tests/auth/test-hello-world-no-ssh-keys.sh - name: run test-hello-world-with-non-authorized-key.sh - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} scripts/tests/auth/test-hello-world-with-non-authorized-key.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} scripts/tests/auth/test-hello-world-with-non-authorized-key.sh - name: run test-self-hosted.sh - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} frontend=${{inputs.BINARY}} scripts/tests/auth/test-self-hosted.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} frontend=${{inputs.BINARY}} scripts/tests/auth/test-self-hosted.sh timeout-minutes: 10 # auto-generated-entries end - name: Buildkit logs (runs on failure) diff --git a/.github/workflows/reusable-secrets-integrations.yml b/.github/workflows/reusable-secrets-integrations.yml index 44dbccbf4f..9fc4d9609d 100644 --- a/.github/workflows/reusable-secrets-integrations.yml +++ b/.github/workflows/reusable-secrets-integrations.yml @@ -3,7 +3,7 @@ name: Secrets Integrations on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -57,7 +57,7 @@ jobs: DOCKERHUB_USERNAME: "${{ vars.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_TOKEN }}" EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}" - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -68,7 +68,7 @@ jobs: - name: install expect run: sudo apt-get install -y expect - name: run secrets-integration - run: env earthly=${{inputs.BUILT_EARTHLY_PATH}} scripts/tests/secrets-integration.sh + run: env earthly=${{inputs.BUILT_EARTHBUILD_PATH}} scripts/tests/secrets-integration.sh - name: Buildkit logs (runs on failure) if: ${{ failure() }} run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd || true diff --git a/.github/workflows/reusable-test-local.yml b/.github/workflows/reusable-test-local.yml index 15c35c284e..06a9e95c43 100644 --- a/.github/workflows/reusable-test-local.yml +++ b/.github/workflows/reusable-test-local.yml @@ -3,10 +3,10 @@ name: Runs test local on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string - RUN_EARTHLY_TEST_ARGS: + RUN_EARTHBUILD_TEST_ARGS: required: false type: string default: "--use-inline-cache --save-inline-cache --no-output" @@ -60,7 +60,7 @@ jobs: DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME: "${{ vars.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_TOKEN }}" - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -69,11 +69,11 @@ jobs: EARTHLY_VERSION_FLAG_OVERRIDES="$(tr -d '\n' < .earthly_version_flag_overrides)" echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Execute test-local - run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} ${{inputs.RUN_EARTHLY_TEST_ARGS}} ./tests/local+test-local --FRONTEND=${{inputs.BINARY}}" + run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} ${{inputs.RUN_EARTHBUILD_TEST_ARGS}} ./tests/local+test-local --FRONTEND=${{inputs.BINARY}}" - name: Execute test-local --push - run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} ${{inputs.RUN_EARTHLY_TEST_ARGS}} --push ./tests/local+test-local --FRONTEND=${{inputs.BINARY}}" + run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} ${{inputs.RUN_EARTHBUILD_TEST_ARGS}} --push ./tests/local+test-local --FRONTEND=${{inputs.BINARY}}" - name: Run general local tests (TODO this is re-testing the +test-local target) - run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} ${{inputs.RUN_EARTHLY_TEST_ARGS}} ./tests/local+all --FRONTEND=${{inputs.BINARY}} --FRONTEND_COMPOSE=${{inputs.BINARY_COMPOSE}}" + run: "${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} ${{inputs.RUN_EARTHBUILD_TEST_ARGS}} ./tests/local+all --FRONTEND=${{inputs.BINARY}} --FRONTEND_COMPOSE=${{inputs.BINARY_COMPOSE}}" - name: Buildkit logs (runs on failure) if: ${{ failure() }} run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd || true diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml index 009bab960a..44d56780e4 100644 --- a/.github/workflows/reusable-test.yml +++ b/.github/workflows/reusable-test.yml @@ -6,7 +6,7 @@ on: TEST_TARGET: required: true type: string - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -64,7 +64,7 @@ jobs: GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }} DOCKERHUB_USERNAME: ${{ vars.DOCKERHUB_USERNAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" USE_QEMU: "${{ inputs.USE_QEMU }}" USE_NEXT: "${{ inputs.USE_NEXT }}" @@ -76,7 +76,7 @@ jobs: echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Execute ${{ inputs.TEST_TARGET }} (Earthly Only) run: |- - ${{inputs.SUDO}} ${{ inputs.BUILT_EARTHLY_PATH }} ${{inputs.EXTRA_ARGS}} --ci -P ${{inputs.TEST_TARGET}} + ${{inputs.SUDO}} ${{ inputs.BUILT_EARTHBUILD_PATH }} ${{inputs.EXTRA_ARGS}} --ci -P ${{inputs.TEST_TARGET}} - name: Display buildkit version run: |- ${{inputs.SUDO}} ${{inputs.BINARY}} ps -a @@ -84,7 +84,7 @@ jobs: shell: bash - name: Execute fail test run: | - ! ${{inputs.SUDO}} GITHUB_ACTIONS="" ${{ inputs.BUILT_EARTHLY_PATH }} ${{inputs.EXTRA_ARGS}} --ci ./tests/fail+test-fail + ! ${{inputs.SUDO}} GITHUB_ACTIONS="" ${{ inputs.BUILT_EARTHBUILD_PATH }} ${{inputs.EXTRA_ARGS}} --ci ./tests/fail+test-fail - name: Buildkit logs (runs on failure) if: ${{ failure() }} run: ${{inputs.SUDO}} ${{inputs.BINARY}} logs earthly-buildkitd || true diff --git a/.github/workflows/reusable-wait-block-main.yml b/.github/workflows/reusable-wait-block-main.yml index b9b8f57546..4022c8f4f5 100644 --- a/.github/workflows/reusable-wait-block-main.yml +++ b/.github/workflows/reusable-wait-block-main.yml @@ -3,7 +3,7 @@ name: Wait-block-override on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -53,7 +53,7 @@ jobs: DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME: "${{ vars.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_TOKEN }}" - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env diff --git a/.github/workflows/reusable-wait-block-target.yml b/.github/workflows/reusable-wait-block-target.yml index c79b243049..503c6dfdd6 100644 --- a/.github/workflows/reusable-wait-block-target.yml +++ b/.github/workflows/reusable-wait-block-target.yml @@ -3,7 +3,7 @@ name: Wait-block-override on: workflow_call: inputs: - BUILT_EARTHLY_PATH: + BUILT_EARTHBUILD_PATH: required: true type: string BINARY: @@ -60,7 +60,7 @@ jobs: DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" DOCKERHUB_USERNAME: "${{ vars.DOCKERHUB_USERNAME }}" DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_TOKEN }}" - BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}" + BUILT_EARTHBUILD_PATH: "${{ inputs.BUILT_EARTHBUILD_PATH }}" BINARY: "${{ inputs.BINARY }}" SUDO: "${{ inputs.SUDO }}" - name: Set EARTHLY_VERSION_FLAG_OVERRIDES env @@ -70,7 +70,7 @@ jobs: echo "EARTHLY_VERSION_FLAG_OVERRIDES=$EARTHLY_VERSION_FLAG_OVERRIDES" >> "$GITHUB_ENV" - name: Execute ${{inputs.TARGET_NAME}} using wait-block override run: |- - ${{inputs.SUDO}} ${{inputs.BUILT_EARTHLY_PATH}} ${{inputs.EXTRA_ARGS}} --ci -P --global-wait-end \ + ${{inputs.SUDO}} ${{inputs.BUILT_EARTHBUILD_PATH}} ${{inputs.EXTRA_ARGS}} --ci -P --global-wait-end \ ${{inputs.TARGET_NAME}} --GLOBAL_WAIT_END=true - name: Buildkit logs (runs on failure) if: ${{ failure() }}