From 01fd17f095a3f1e842ccc304b70cdc3135b39a7c Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Thu, 20 Jun 2024 17:06:43 -0700 Subject: [PATCH 1/5] Add rust toolchain --- ci-image/Dockerfile | 2 ++ ci-image/conf/install.sh.template | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-image/Dockerfile b/ci-image/Dockerfile index d560a83..7a22294 100644 --- a/ci-image/Dockerfile +++ b/ci-image/Dockerfile @@ -17,6 +17,8 @@ RUN apt-get install -y fontconfig RUN apt-get install -y gcc-multilib g++-multilib RUN apt-get install -y libxkbcommon-dev libegl-dev RUN apt-get install -y zstd +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- --profile minimal -y +ENV PATH=/root/.cargo/bin:$PATH RUN pip3 install "virtualenv<20" pygithub # fix missing libreadline.so.7 diff --git a/ci-image/conf/install.sh.template b/ci-image/conf/install.sh.template index aa3bb1b..b383b1b 100644 --- a/ci-image/conf/install.sh.template +++ b/ci-image/conf/install.sh.template @@ -9,7 +9,7 @@ cp $CONF/nose2.cfg . python3 -mvirtualenv --python=`which python3` ./virtualenv source ./virtualenv/bin/activate -pip install -U 'pip==21.3.1' 'setuptools<64' +pip install -U 'pip==21.3.1' 'setuptools<64' maturin pip install --requirement ./requirements.txt --no-cache --src ./src --no-build-isolation pip freeze > freeze.txt From 76998d834f98c57855e52d94645fc0a2239904e2 Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Thu, 20 Jun 2024 17:26:10 -0700 Subject: [PATCH 2/5] Build images in PRs --- .github/workflows/publish-ci-image.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-ci-image.yml b/.github/workflows/publish-ci-image.yml index f236355..0f922c1 100644 --- a/.github/workflows/publish-ci-image.yml +++ b/.github/workflows/publish-ci-image.yml @@ -3,6 +3,7 @@ name: Publish angr ci docker image on: push: branches: ["master"] + pull_request: workflow_dispatch: jobs: @@ -21,3 +22,4 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }} - name: Push ci image run: docker push angr/ci:3 + if: github.event_name != 'pull_request' From d58df9ac9442645cd85a659b1cf56323cd4a43a1 Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Thu, 20 Jun 2024 17:31:04 -0700 Subject: [PATCH 3/5] Install curl --- ci-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-image/Dockerfile b/ci-image/Dockerfile index 7a22294..2802950 100644 --- a/ci-image/Dockerfile +++ b/ci-image/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get install -y strace RUN apt-get install -y fontconfig RUN apt-get install -y gcc-multilib g++-multilib RUN apt-get install -y libxkbcommon-dev libegl-dev -RUN apt-get install -y zstd +RUN apt-get install -y zstd curl RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- --profile minimal -y ENV PATH=/root/.cargo/bin:$PATH RUN pip3 install "virtualenv<20" pygithub From fc6e4d5b3d32ceb69b1231b14ad918b6657fb60c Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Thu, 20 Jun 2024 17:52:40 -0700 Subject: [PATCH 4/5] Add some quotes --- ci-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-image/Dockerfile b/ci-image/Dockerfile index 2802950..aa09bd5 100644 --- a/ci-image/Dockerfile +++ b/ci-image/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get install -y fontconfig RUN apt-get install -y gcc-multilib g++-multilib RUN apt-get install -y libxkbcommon-dev libegl-dev RUN apt-get install -y zstd curl -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- --profile minimal -y +RUN bash -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- --profile minimal -y" ENV PATH=/root/.cargo/bin:$PATH RUN pip3 install "virtualenv<20" pygithub From 7ffa3ca3bbe0083d4cbbdb8e3be072fbe6b4c397 Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Mon, 24 Jun 2024 13:34:50 -0700 Subject: [PATCH 5/5] Fix the rust installation --- ci-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-image/Dockerfile b/ci-image/Dockerfile index aa09bd5..9f47949 100644 --- a/ci-image/Dockerfile +++ b/ci-image/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get install -y fontconfig RUN apt-get install -y gcc-multilib g++-multilib RUN apt-get install -y libxkbcommon-dev libegl-dev RUN apt-get install -y zstd curl -RUN bash -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -- --profile minimal -y" +RUN bash -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal -y" ENV PATH=/root/.cargo/bin:$PATH RUN pip3 install "virtualenv<20" pygithub