diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2714ff7c1..5b787b273 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,6 @@ on: branches: - dev - master - - fix-jetson-ort paths-ignore: - "docs/**" @@ -20,7 +19,6 @@ env: jobs: amd64_build: - if: false runs-on: ubuntu-22.04 name: AMD64 Build steps: @@ -44,7 +42,6 @@ jobs: tags: ${{ steps.setup.outputs.image-name }}-amd64 cache-from: type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64 arm64_build: - if: false runs-on: ubuntu-22.04-arm name: ARM Build steps: @@ -139,7 +136,6 @@ jobs: *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp6 *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp6,mode=max amd64_extra_builds: - if: false runs-on: ubuntu-22.04 name: AMD64 Extra Build needs: @@ -182,7 +178,6 @@ jobs: *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-rocm,mode=max *.cache-from=type=gha arm64_extra_builds: - if: false runs-on: ubuntu-22.04-arm name: ARM Extra Build needs: @@ -210,7 +205,6 @@ jobs: # The majority of users running arm64 are rpi users, so the rpi # build should be the primary arm64 image assemble_default_build: - if: false runs-on: ubuntu-22.04 name: Assemble and push default build needs: diff --git a/docker/tensorrt/Dockerfile.arm64 b/docker/tensorrt/Dockerfile.arm64 index f334f0711..b4060f70a 100644 --- a/docker/tensorrt/Dockerfile.arm64 +++ b/docker/tensorrt/Dockerfile.arm64 @@ -92,7 +92,7 @@ RUN mkdir -p /etc/ld.so.conf.d && echo /usr/lib/ffmpeg/jetson/lib/ > /etc/ld.so. COPY --from=trt-wheels /etc/TENSORRT_VER /etc/TENSORRT_VER RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ --mount=type=bind,from=trt-model-wheels,source=/trt-model-wheels,target=/deps/trt-model-wheels \ - pip3 uninstall -y onnxruntime-openvino \ + pip3 uninstall -y onnxruntime \ && pip3 install -U /deps/trt-wheels/*.whl /deps/trt-model-wheels/*.whl \ && ldconfig