Skip to content

Commit

Permalink
fix: Improve workflow for main branch and PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
gmpinder committed Jan 27, 2024
1 parent 67f2d34 commit 623db5a
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 5 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Earthly +build

on:
pull_request:

env:
FORCE_COLOR: 1

jobs:
build:
timeout-minutes: 60
runs-on: ubuntu-latest

steps:
- uses: earthly/actions-setup@v1
with:
use-cache: true
version: v0.8.2

# Setup repo and add caching
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.ref }}

- name: Run build
run: earthly --ci -P +build

10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Earthly +build

on:
workflow_dispatch:
merge_group:
pull_request:
push:
branches:
- main
Expand All @@ -15,17 +13,19 @@ jobs:
build:
permissions:
packages: write
timeout-minutes: 30
timeout-minutes: 60
runs-on: ubuntu-latest

steps:
- uses: earthly/actions-setup@v1
with:
use-cache: true
version: v0.8.0
version: v0.8.2

# Setup repo and add caching
- uses: actions/checkout@v4
with:
ref: main

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand All @@ -35,4 +35,4 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Run build
run: earthly --push --ci -P +all
run: earthly --push --ci -P +build
5 changes: 5 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ ARG --global IMAGE=ghcr.io/blue-build/cli
all:
BUILD +default
BUILD +nightly
BUILD +integration-tests --NIGHTLY=true --NIGHTLY=false

build:
BUILD +default
BUILD +nightly

default:
ARG NIGHTLY=false
Expand Down

0 comments on commit 623db5a

Please sign in to comment.