Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/run-make/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ runs:
- name: Clean
run: |
make clean
docker system prune -f -a
rm -rf ~/.linuxkit
#docker system prune -f -a
#rm -rf ~/.linuxkit
shell: bash
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:
- name: Clear repository
run: |
sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
rm -fr ~/.linuxkit
docker system prune --all --force --volumes
# rm -fr ~/.linuxkit
# docker system prune --all --force --volumes
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down Expand Up @@ -221,5 +221,5 @@ jobs:
if: ${{ always() }}
run: |
make clean
docker system prune -f -a --volumes
rm -rf ~/.linuxkit
# docker system prune -f -a --volumes
# rm -rf ~/.linuxkit
2 changes: 1 addition & 1 deletion .github/workflows/buildondemand.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: |
sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
rm -fr ~/.linuxkit
docker system prune --all --force --volumes
#docker system prune --all --force --volumes
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on: # yamllint disable-line rule:truthy

jobs:
packages:
if: github.event.repository.full_name == 'lf-edge/eve'
if: github.event.repository.full_name == 'rene/eve'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
echo "TAG=$(echo "$REF" | sed -e 's#^.*/##' -e 's#master#snapshot#' -e 's#main#snapshot#')" >> "$GITHUB_ENV"

- name: Login to Docker Hub
if: ${{ github.event.repository.full_name }}== 'lf-edge/eve'
if: ${{ github.event.repository.full_name }}== 'rene/eve'
uses: docker/login-action@v3
with:
username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
Expand All @@ -82,16 +82,17 @@ jobs:
# sadly, our build sometimes times out on network access
# and running out of disk space: re-trying for 3 times
for i in 1 2 3; do
if make -e V=1 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then
if make -e V=1 REGISTRY=localhost:5001 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then
SUCCESS=true
break
else
# the most likely reason for 'make pkgs' to fail is
# the docker cache produced by the build exhausting
# disk space. So the following can't hurt before we
# retry:
docker rmi -f `docker image ls -q` || :
docker system prune -f || :
#docker rmi -f `docker image ls -q` || :
#docker system prune -f || :
echo "NOT cleaning up"
fi
done
if [ -z "$SUCCESS" ]; then echo "::error::failed to build and push packages" && exit 1; fi
Expand All @@ -106,13 +107,13 @@ jobs:
- name: Clean
run: |
make clean
docker system prune -f -a
rm -rf ~/.linuxkit
#docker system prune -f -a
#rm -rf ~/.linuxkit

# eve composition can run as a separate job, even on a separate runner, because the packages job
# published everything. Which means all images are already on the OCI registry.
eve:
if: github.event.repository.full_name == 'lf-edge/eve'
if: github.event.repository.full_name == 'rene/eve'
needs: packages
runs-on: ubuntu-latest
strategy:
Expand All @@ -137,18 +138,18 @@ jobs:
fetch-depth: 0
- uses: ./.github/actions/run-make
with:
command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve"
command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} REGISTRY=localhost:5001 PLATFORM=${{ matrix.platform }} LINUXKIT_PKG_TARGET=push eve"
dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
- uses: ./.github/actions/run-make
if: matrix.arch != 'riscv64'
with:
command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources"
command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} REGISTRY=localhost:5001 LINUXKIT_PKG_TARGET=push sbom collected_sources compare_sbom_collected_sources publish_sources"
dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}

manifest:
if: github.event.repository.full_name == 'lf-edge/eve'
if: github.event.repository.full_name == 'rene/eve'
runs-on: ubuntu-latest
needs: packages
steps:
Expand All @@ -157,13 +158,13 @@ jobs:
fetch-depth: 0
- uses: ./.github/actions/run-make
with:
command: "V=1 LINUXKIT_PKG_TARGET=manifest pkgs"
command: "V=1 REGISTRY=localhost:5001 LINUXKIT_PKG_TARGET=manifest pkgs"
dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}

trigger_assets:
if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'lf-edge/eve') }}
if: ${{ (startsWith(github.ref, 'refs/tags/')) && (github.event.repository.full_name == 'rene/eve') }}
needs: [manifest, eve]
uses: lf-edge/eve/.github/workflows/assets.yml@master
uses: rene/eve/.github/workflows/assets.yml@master
with:
tag_ref: ${{ github.ref_name }}
5 changes: 5 additions & 0 deletions .github/workflows/yetus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
path: src
fetch-depth: 0

- name: Setup dependencies
run: |
sudo apt -y update
sudo apt -y install libzfs4linux libzfslinux-dev

- name: Yetus
uses: apache/yetus-test-patch-action@0.15.1
with:
Expand Down
1 change: 1 addition & 0 deletions .yetus/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^pkg/mkimage-raw-efi/initramfs-init
^pkg/mkimage-raw-efi/nlplug-findfs.c
^pkg/pillar/rootfs/fscrypt.conf
^pkg/pillar/vendor/github.com/andrewd-zededa/go-libzfs
^pkg/fw/
^pkg/debug/abuild/
^pkg/pillar/zedpac/
Expand Down
4 changes: 2 additions & 2 deletions pkg/nvidia/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN git config --global user.email 'builder@projecteve.dev' && \
git config --global user.name 'Project EVE'

# Jetpack tarballs
ENV JETSON_JP5=https://developer.nvidia.com/downloads/embedded/l4t/r35_release_v5.0/release/jetson_linux_r35.5.0_aarch64.tbz2
ENV JETSON_JP6=https://developer.nvidia.com/downloads/embedded/l4t/r36_release_v3.0/release/jetson_linux_r36.3.0_aarch64.tbz2
ENV JETSON_JP5=http://10.208.13.10/jetson_linux_r35.5.0_aarch64.tbz2
ENV JETSON_JP6=http://10.208.13.10/jetson_linux_r36.3.0_aarch64.tbz2

# Default Jetpack version
ENV JETSON_LINUX=${JETSON_JP5}
Expand Down
2 changes: 2 additions & 0 deletions pkg/pillar/netdump/netdump.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package netdump

// CHANGE

import (
"encoding/json"
"fmt"
Expand Down
Loading