Skip to content

Commit

Permalink
Remove default MODEL that doesn't work
Browse files Browse the repository at this point in the history
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
  • Loading branch information
jimmykarily committed Jul 31, 2023
1 parent 1479f84 commit ac0c6af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ jobs:
run: |
export TAG=${GITHUB_REF##*/}
# TODO: Build all arm generic too!!
./earthly.sh +all-arm -VARIANT=kairos -PROVIDER_KAIROS=true -K3S_VERSION=${{ matrix.k3s_version }} -FLAVOR=${{ matrix.flavor }}
# TODO: Build all arm generic too!! (and other models?)
earthly +all-arm -VARIANT=standard -MODEL=rpi64 -PROVIDER_KAIROS=true -K3S_VERSION=${{ matrix.k3s_version }} -FLAVOR=${{ matrix.flavor }}
- name: Selfhosted Build 🔧
if: ${{ matrix.worker == 'self-hosted' }}
env:
Expand Down
5 changes: 3 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ END
ARG COSIGN_EXPERIMENTAL=0
ARG CGO_ENABLED=0
# renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver-coerced
ARG OSBUILDER_VERSION=v0.8.0
ARG OSBUILDER_VERSION=v0.7.11
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
ARG GOLINT_VERSION=1.52.2
# renovate: datasource=docker depName=golang
Expand Down Expand Up @@ -355,6 +355,7 @@ base-image:
ARG PROVIDER_KAIROS
ARG PROVIDER_KAIROS_BRANCH
ARG K3S_VERSION
# TODO: Use VARIANT=standard instead?
IF [[ "$PROVIDER_KAIROS" != "" ]]
DO +PROVIDER_INSTALL -PROVIDER_KAIROS_BRANCH=${PROVIDER_KAIROS_BRANCH}

Expand Down Expand Up @@ -626,7 +627,7 @@ arm-image:
ARG COMPRESS_IMG=true
ARG IMG_COMPRESSION=xz
FROM $OSBUILDER_IMAGE
ARG MODEL=rpi64
ARG MODEL
COPY +version/VERSION ./
RUN echo "version ${VERSION}"
ARG VERSION=$(cat VERSION)
Expand Down

0 comments on commit ac0c6af

Please sign in to comment.