Merge branch 'main' into patch-3

blue-build · Feb 14, 2024 · 2b3166a · 2b3166a
2 parents 1477eaf + bb7ab8e
commit 2b3166a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -17,7 +17,9 @@ jobs:
           version: v0.8.3
 
       - name: Earthly login
-        if: github.repository == 'blue-build/cli'
+        env:
+          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
+        if: env.EARTHLY_SAT_TOKEN != null
         run: |
           earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
           earthly org s blue-build

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,9 @@ jobs:
           version: v0.8.3
 
       - name: Earthly login
-        if: github.repository == 'blue-build/cli'
+        env:
+          EARTHLY_SAT_TOKEN: ${{ secrets.EARTHLY_SAT_TOKEN }}
+        if: env.EARTHLY_SAT_TOKEN != null
         run: |
           earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
           earthly org s blue-build
@@ -43,6 +45,3 @@ jobs:
       - name: Run build
         if: github.repository == 'blue-build/cli'
         run: earthly --push --ci -P +all
-      - name: Run build
-        if: github.repository != 'blue-build/cli'
-        run: earthly --ci -P +all