diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 9e79c94..d700180 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -12,12 +12,24 @@ jobs: runs-on: ubuntu-latest steps: + # There is a bug selecting a satellite in version 0.8 + # so we use 0.7 to login and connect to the satellite + # before switching to the latest version - uses: earthly/actions-setup@v1 with: - use-cache: true + version: v0.7.23 + + - name: Earthly login + run: | + earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null + earthly org s blue-build + earthly sat s blue-build-pr + + - uses: earthly/actions-setup@v1 + + with: version: v0.8.2 - # Setup repo and add caching - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.ref }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab41bcc..2ff31ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Earthly main branch +build +name: Earthly main branch +all on: workflow_dispatch: @@ -17,9 +17,21 @@ jobs: runs-on: ubuntu-latest steps: + # There is a bug selecting a satellite in version 0.8 + # so we use 0.7 to login and connect to the satellite + # before switching to the latest version + - uses: earthly/actions-setup@v1 + with: + version: v0.7.23 + + - name: Earthly login + run: | + earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null + earthly org s blue-build + earthly sat s blue-build + - uses: earthly/actions-setup@v1 with: - use-cache: true version: v0.8.2 # Setup repo and add caching @@ -35,4 +47,4 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Run build - run: earthly --push --ci -P +build + run: earthly --push --ci -P +all diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 034139b..f5248e9 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -23,12 +23,22 @@ jobs: fetch-tags: true token: ${{ secrets.GIT_REPO_TOKEN }} - #Deps - - name: Set up Earthly - uses: earthly/actions-setup@v1 + # There is a bug selecting a satellite in version 0.8 + # so we use 0.7 to login and connect to the satellite + # before switching to the latest version + - uses: earthly/actions-setup@v1 with: - version: v0.8.0 - use-cache: true + version: v0.7.23 + + - name: Earthly login + run: | + earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null + earthly org s blue-build + earthly sat s blue-build + + - uses: earthly/actions-setup@v1 + with: + version: v0.8.2 - name: Set up Python uses: actions/setup-python@v5 diff --git a/Earthfile b/Earthfile index c924376..ae329ba 100644 --- a/Earthfile +++ b/Earthfile @@ -1,4 +1,5 @@ VERSION 0.8 +PROJECT blue-build/cli IMPORT github.com/blue-build/earthly-lib/cargo AS cargo