diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f40ffd7a795..04a1349d445 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index db236f651d2..e898a943039 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -73,7 +73,7 @@ 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 LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then + if make -e V=1 REGISTRY=localhost:5001 LINUXKIT_PKG_TARGET=push PRUNE=1 pkgs; then SUCCESS=true break else @@ -120,13 +120,13 @@ jobs: fetch-depth: 0 - uses: ./.github/actions/run-make with: - command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push eve" + command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} REGISTRY=localhost:5001 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 }} diff --git a/docs/mkdocs/prepare_mkdocs.py b/docs/mkdocs/prepare_mkdocs.py index b1c2ecf1e6d..a7735953c6f 100644 --- a/docs/mkdocs/prepare_mkdocs.py +++ b/docs/mkdocs/prepare_mkdocs.py @@ -18,7 +18,8 @@ # Regex reLinks = re.compile(r'\[([^\]]+)\]\(([^)]+)\)') -reURL = re.compile(r'[A-Za-z0-9]+://[A-Za-z0-9%-_]+(/[A-Za-z0-9%-_])*(#|\\?)[A-Za-z0-9%-_&=]*') +# pylint: disable-next=line-too-long +reURL = re.compile(r'^(https?|ftp):\/\/([A-Za-z0-9-]+\.)+[A-Za-z]{2,6}(:\d+)?(\/[A-Za-z0-9-._~:?#[\]@!$&\'()*+,;=\/]*)?$') reMAIL = re.compile(r'mailto:.*') reANCHOR = re.compile(r'^#.*') diff --git a/docs/mkdocs/requirements.txt b/docs/mkdocs/requirements.txt index 4b2a5ff9252..52a4fae72a7 100644 --- a/docs/mkdocs/requirements.txt +++ b/docs/mkdocs/requirements.txt @@ -1,2 +1,2 @@ -jinja2<3.1.0 +jinja2>=3.1.6 mkdocs==1.3.1 diff --git a/pkg/nvidia/Dockerfile b/pkg/nvidia/Dockerfile index 5c2c20c2da7..8d0454f81b9 100644 --- a/pkg/nvidia/Dockerfile +++ b/pkg/nvidia/Dockerfile @@ -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} diff --git a/pkg/pillar/cmd/domainmgr/domainmgr.go b/pkg/pillar/cmd/domainmgr/domainmgr.go index ec67747b424..b24fd17585e 100644 --- a/pkg/pillar/cmd/domainmgr/domainmgr.go +++ b/pkg/pillar/cmd/domainmgr/domainmgr.go @@ -8,6 +8,8 @@ package domainmgr +// Test GHA + import ( "bufio" "bytes"