Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "GitHub Actions: build.yml: add platform parameter" #2

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Revert "GitHub Actions: build.yml: add platform parameter" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,9 @@ jobs:
matrix:
arch: [arm64, amd64]
hv: [xen, kvm]
platform: ["generic"]
include:
- arch: riscv64
hv: mini
platform: "generic"
- arch: amd64
hv: kvm
platform: "rt"
- arch: arm64
hv: kvm
platform: "nvidia"
- arch: arm64
hv: kvm
platform: "imx8mp_pollux"
- arch: arm64
hv: kvm
platform: "imx8mp_epc_r3720"

steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -137,9 +122,9 @@ jobs:
echo "TAG=evebuild/pr:$PR_ID" >> $GITHUB_ENV
echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV"

- name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
- name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}
run: |
make V=1 ROOTFS_VERSION="$VERSION" PLATFORM=${{ matrix.platform }} HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} pkgs eve # note that this already loads it into docker
make V=1 ROOTFS_VERSION="$VERSION" HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} pkgs eve # note that this already loads it into docker
- name: Post eve build report
run: |
echo Disk usage
Expand All @@ -150,18 +135,17 @@ jobs:
docker system df -v
- name: Export docker container
run: |
make cache-export ZARCH=${{ matrix.arch }} IMAGE=lfedge/eve:$VERSION-${{ matrix.hv }} OUTFILE=eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}.tar IMAGE_NAME=$TAG-${{ matrix.hv }}-${{ matrix.arch }}
- name: Upload EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
make cache-export ZARCH=${{ matrix.arch }} IMAGE=lfedge/eve:$VERSION-${{ matrix.hv }} OUTFILE=eve-${{ matrix.hv }}-${{ matrix.arch }}.tar IMAGE_NAME=$TAG-${{ matrix.hv }}-${{ matrix.arch }}
- name: Upload EVE ${{ matrix.hv }}-${{ matrix.arch }}
uses: actions/upload-artifact@v4
with:
name: eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
path: eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}.tar
- name: Clean EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
name: eve-${{ matrix.hv }}-${{ matrix.arch }}
path: eve-${{ matrix.hv }}-${{ matrix.arch }}.tar
- name: Clean EVE ${{ matrix.hv }}-${{ matrix.arch }}
run: |
make clean
docker rmi "$TAG-${{ matrix.hv }}-${{ matrix.arch }}" "lfedge/eve:$VERSION-${{ matrix.hv }}" "lfedge/eve:$VERSION-${{ matrix.hv }}-${{ matrix.arch }}" ||:
- name: Post clean eve ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
report
- name: Post clean eve ${{ matrix.hv }}-${{ matrix.arch }} report
run: |
echo Disk usage
df -h
Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/buildondemand.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,9 @@ jobs:
matrix:
arch: [arm64, amd64]
hv: [xen, kvm]
platform: ["generic"]
include:
- arch: riscv64
hv: mini
platform: "generic"
- arch: amd64
hv: kvm
platform: "rt"
- arch: arm64
hv: kvm
platform: "nvidia"
- arch: arm64
hv: kvm
platform: "imx8mp_pollux"
- arch: arm64
hv: kvm
platform: "imx8mp_epc_r3720"
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -121,7 +107,7 @@ jobs:

- uses: ./.github/actions/run-make
with:
command: "V=1 HV=${{ matrix.hv }} PLATFORM=${{ matrix.platform }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push $FORCE_BUILD eve"
command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push $FORCE_BUILD eve"
dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
- uses: ./.github/actions/run-make
Expand Down
Loading