..

metalbear-co · Oct 11, 2024 · 0a5235b · 0a5235b
1 parent ebc8f1d
commit 0a5235b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 35 deletions.
diff --git a/.github/workflows/agent-build.yaml b/.github/workflows/agent-build.yaml
@@ -12,20 +12,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: agent-build/builder.Dockerfile
@@ -42,20 +42,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: agent-build/runtime.Dockerfile

diff --git a/.github/workflows/docs-build.yaml b/.github/workflows/docs-build.yaml
@@ -12,20 +12,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docs-build/Dockerfile

diff --git a/.github/workflows/layer-build.yaml b/.github/workflows/layer-build.yaml
@@ -12,20 +12,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: layer-build/Dockerfile

diff --git a/.github/workflows/rust-build.yaml b/.github/workflows/rust-build.yaml
@@ -12,20 +12,20 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: rust-build/Dockerfile

diff --git a/.github/workflows/tests-runner-build.yaml b/.github/workflows/tests-runner-build.yaml
@@ -12,17 +12,17 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: tests-runner/Dockerfile

diff --git a/agent-build/builder.Dockerfile b/agent-build/builder.Dockerfile
@@ -7,5 +7,5 @@ RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2024-10-11
 ENV PATH="$PATH:/root/.cargo/bin"
 RUN rustup target add --toolchain nightly-2024-10-11 x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-RUN uv tool install cargo-zigbuild
+RUN curl -sSL https://bootstrap.pypa.io/pip/3.7/get-pip.py -o get-pip.py && python3 get-pip.py
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true python3 -m pip install cargo-zigbuild
diff --git a/e2e-setup-action/action.yaml b/e2e-setup-action/action.yaml
@@ -29,9 +29,8 @@ runs:
         node-version: 14
     - run: npm install express
       shell: bash
-    - name: Install uv
-      uses: astral-sh/setup-uv@v3
-    - run: uv pip install --system flask fastapi uvicorn[standard]
+    - uses: actions/setup-python@v3
+    - run: pip3 install flask fastapi uvicorn[standard]
       shell: bash
     - uses: actions/setup-go@v3
       with:

diff --git a/tests-runner/Dockerfile b/tests-runner/Dockerfile
@@ -2,7 +2,7 @@ FROM buildpack-deps:bookworm
 
 WORKDIR /tests-runner
 
-RUN apt-get update && apt-get install -y protobuf-compiler gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu curl bison npm bash bsdmainutils ca-certificates curl gnupg zip clang
+RUN apt-get update && apt-get install -y python3-pip protobuf-compiler gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu curl bison npm python3-pip bash bsdmainutils ca-certificates curl gnupg zip clang
 
 # docker stuff
 RUN install -m 0755 -d /etc/apt/keyrings
@@ -22,16 +22,15 @@ SHELL ["/bin/bash", "-c"]
 # rust stuff
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
 RUN chmod +x rustup-init.sh
-RUN ./rustup-init.sh -y -c rustfmt -c clippy --default-toolchain nightly-2024-10-11
+RUN ./rustup-init.sh -y -c rustfmt -c clippy --default-toolchain nightly-2024-04-15
 ENV PATH="/root/.cargo/bin:$PATH"
-RUN rustup target add --toolchain nightly-2024-10-11 aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-apple-darwin aarch64-apple-darwin
+RUN rustup target add --toolchain nightly-2024-04-15 aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-apple-darwin aarch64-apple-darwin
 
 
 # install pip for cargo-zigbuild
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-RUN uv tool install cargo-zigbuild
+RUN curl -sSL https://bootstrap.pypa.io/pip/3.7/get-pip.py -o get-pip.py && python3 get-pip.py --break-system-packages
 # cargo zigbuild + Python tests dependencies
-RUN uv pip install --system flask fastapi uvicorn "httptools>=0.5.0" "uvloop>=0.14.0,!=0.15.0,!=0.15.1"
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true python3 -m pip install --break-system-packages cargo-zigbuild flask fastapi uvicorn "httptools>=0.5.0" "uvloop>=0.14.0,!=0.15.0,!=0.15.1"
 
 # npm dependencies
 RUN npm install express