remove earthly token and fix ci

.circleci/config.yml

@@ -24,7 +24,7 @@ jobs:
           name: Run tests
           command: |-
               ./build/linux/amd64/earthly --ci -P \
-              +smoke-test --DOCKERHUB_MIRROR_AUTH_FROM_CLOUD_SECRETS=true && echo "circleci tests passed"
+              +smoke-test && echo "circleci tests passed"
 workflows:
   version: 2
   circle-ci:

.gitbook.yaml

@@ -13,8 +13,6 @@ redirects:
     guides/auth: guides/auth.md
     guides/cache: caching/managing-cache.md
     docs/guides/cache: caching/managing-cache.md
-    docs/guides/cloud-secrets: cloud/cloud-secrets.md
-    guides/cloud-secrets: cloud/cloud-secrets.md
     guides/debugging: guides/debugging.md
     guides/docker-in-earthly: guides/docker-in-earthly.md
     guides/integration: guides/integration.md
@@ -78,4 +76,3 @@ redirects:
     guides/configuring-registries: guides/auth.md
     guides/shared-cache: ./caching/caching-via-registry.md
     docs/remote-caching: ./caching/caching-via-registry.md
-    earthly-cloud/satellites: cloud/satellites.md

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

@@ -21,12 +21,6 @@ inputs:
     description: "Whether to use earthly-next"
     required: false
     default: 'false'
-  EARTHLY_ORG:
-    description: "The Earthly organization"
-    required: false
-  EARTHLY_TOKEN:
-    description: "Earthly token (legacy - not used with GCR mirror)"
-    required: false
   GHCR_USERNAME:
     description: "GHCR username (legacy - now uses github.actor)"
     required: false

.github/workflows/build-earthly.yml

@@ -34,7 +34,6 @@ jobs:
     permissions: write-all
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       # Used in our github action as the token - TODO: look to change it into an input
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-docker-ubuntu.yml

@@ -264,75 +264,20 @@ jobs:
       # EXTRA_ARGS: "--auto-skip"
     secrets: inherit
 
-  docker-tests-test-account:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/account+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      # EXTRA_ARGS: "--auto-skip"
-    secrets: inherit
-
-  docker-test-registry-command-dockerhub:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-dockerhub"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      # EXTRA_ARGS: "--auto-skip"
-    secrets: inherit
-
-  docker-test-registry-command-multi:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-multi"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      # EXTRA_ARGS: "--auto-skip"
-    secrets: inherit
-
-  docker-test-web-command:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/web+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      # EXTRA_ARGS: "--auto-skip"
-    secrets: inherit
-
-  docker-test-oidc-command:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/oidc+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      # EXTRA_ARGS: "--auto-skip"
-    secrets: inherit
+  # TODO: The oidc tests are ignored until we have an AWS account to test with.
+  # docker-test-oidc-command:
+  #   if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
+  #   needs: build-earthly
+  #   uses: ./.github/workflows/reusable-test.yml
+  #   with:
+  #     TEST_TARGET: "./tests/oidc+test"
+  #     BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+  #     RUNS_ON: "ubuntu-latest"
+  #     BINARY: "docker"
+  #     SUDO: ""
+  #     SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+  #     # EXTRA_ARGS: "--auto-skip"
+  #   secrets: inherit
 
   docker-tests-qemu:
     needs: build-earthly
@@ -413,18 +358,6 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  docker-secret-integrations:
-    needs: build-earthly
-    if: ${{ !failure() }}
-    uses: ./.github/workflows/reusable-secrets-integrations.yml
-    with:
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "docker"
-      SUDO: ""
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
   docker-bootstrap-integrations:
     needs: build-earthly
     if: ${{ !failure() }}

.github/workflows/ci-lint-docs.yml

@@ -16,7 +16,6 @@ jobs:
     runs-on: "ubuntu-latest"
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
       DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"

.github/workflows/ci-podman-ubuntu.yml

@@ -236,109 +236,19 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  podman-test-earthly-mirror-was-setup:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests+test-earthly-mirror-was-setup"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-tests-test-account:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/account+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-registry-command-dockerhub:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-dockerhub"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-registry-command-ecr:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-ecr"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-registry-command-gcp:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-gcp"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-registry-command-multi:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/registry-command+test-multi"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-web-command:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/web+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
-
-  podman-test-oidc-command:
-    if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
-    needs: build-earthly
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      TEST_TARGET: "./tests/oidc+test"
-      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      RUNS_ON: "ubuntu-latest"
-      BINARY: "podman"
-      SUDO: "sudo -E"
-      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-    secrets: inherit
+  # TODO: Commented out until we have an AWS account to run tests in
+  # podman-test-oidc-command:
+  #   if: ${{ !failure() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) }}
+  #   needs: build-earthly
+  #   uses: ./.github/workflows/reusable-test.yml
+  #   with:
+  #     TEST_TARGET: "./tests/oidc+test"
+  #     BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+  #     RUNS_ON: "ubuntu-latest"
+  #     BINARY: "podman"
+  #     SUDO: "sudo -E"
+  #     SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+  # secrets: inherit
 
   podman-tests-qemu:
     needs: build-earthly
@@ -427,19 +337,6 @@ jobs:
 #      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
 #    secrets: inherit
 #
-#  podman-secret-integrations:
-#    # TODO: Figure out how to run multiple Podman instances in parallel with different ports for buildkitd
-#    needs: build-earthly
-#    if: ${{ !failure() }}
-#    uses: ./.github/workflows/reusable-secrets-integrations.yml
-#    with:
-#      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-#      RUNS_ON: "ubuntu-latest"
-#      BINARY: "podman"
-#      SUDO: "sudo -E"
-#      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-#    secrets: inherit
-#
 #  podman-bootstrap-integrations:
 #    # TODO: Figure out how to run multiple Podman instances in parallel with different ports for buildkitd
 #    needs: build-earthly

.github/workflows/ci-staging-deploy.yml

@@ -29,7 +29,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       GITHUB_USER: "earthly"
       EARTHLY_REPO: "earthly-staging"

.github/workflows/docs-checks-links.yml

@@ -15,7 +15,6 @@ jobs:
     runs-on: "ubuntu-latest"
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
       DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"

.github/workflows/release-merge-docs.yml

@@ -15,7 +15,6 @@ jobs:
     runs-on: "ubuntu-latest"
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
       DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"

.github/workflows/reusable-bootstrap-integrations.yml

@@ -24,7 +24,6 @@ jobs:
   secret-integration:
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
       DOCKERHUB_MIRROR_PASSWORD: "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"
@@ -40,7 +39,6 @@ jobs:
         with:
           GHCR_USERNAME: ${{ github.actor }}
           GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
           BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}"
           BINARY: "${{ inputs.BINARY }}"
           SUDO: "${{ inputs.SUDO }}"

.github/workflows/reusable-docker-build-integrations.yml

@@ -29,7 +29,6 @@ jobs:
     runs-on: ${{inputs.RUNS_ON}}
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_ORG: "${{inputs.EARTHLY_ORG}}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
@@ -44,7 +43,6 @@ jobs:
         with:
           GHCR_USERNAME: ${{ github.actor }}
           GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
           BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}"
           BINARY: "${{ inputs.BINARY }}"
           SUDO: "${{ inputs.SUDO }}"

.github/workflows/reusable-earthbuild-image-tests.yml

@@ -34,7 +34,6 @@ jobs:
     runs-on: ${{inputs.RUNS_ON}}
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       # Used in our github action as the token - TODO: look to change it into an input
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +45,6 @@ jobs:
         with:
           GHCR_USERNAME: ${{ github.actor }}
           GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
           BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}"
           BINARY: "${{ inputs.BINARY }}"
           SUDO: "${{ inputs.SUDO }}"

.github/workflows/reusable-example.yml

@@ -37,7 +37,6 @@ jobs:
     runs-on: ${{inputs.RUNS_ON}}
     env:
       FORCE_COLOR: 1
-      EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
       EARTHLY_INSTALL_ID: "earthly-githubactions"
       EARTHLY_ORG: "${{inputs.EARTHLY_ORG}}"
       DOCKERHUB_MIRROR_USERNAME: "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}"
@@ -52,7 +51,6 @@ jobs:
         with:
           GHCR_USERNAME: ${{ github.actor }}
           GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
           BUILT_EARTHLY_PATH: "${{ inputs.BUILT_EARTHLY_PATH }}"
           BINARY: "${{ inputs.BINARY }}"
           USE_QEMU: "${{ inputs.USE_QEMU }}"