From 3efaaedbfcf22ea9e2435b17fa01505e6def6b8b Mon Sep 17 00:00:00 2001 From: Florian Ritterhoff <32478819+fritterhoff@users.noreply.github.com> Date: Mon, 11 Dec 2023 05:21:43 +0000 Subject: [PATCH 1/2] fix: overwrite pip packages --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe2ef52..c82b11d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ ADD requirements.txt /tmp ADD requirements.yml /tmp RUN apk --no-cache add sudo python3 py3-pip openssl ca-certificates sshpass openssh-client rsync git tar unzip zip && \ apk --no-cache add --virtual build-dependencies python3-dev libffi-dev musl-dev gcc cargo openssl-dev build-base -RUN pip3 install --upgrade pip wheel && \ - pip3 install --upgrade cryptography && \ - pip3 install --ignore-installed -r /tmp/requirements.txt +RUN pip3 install --break-system-packages --upgrade pip wheel && \ + pip3 install --break-system-packages --upgrade cryptography && \ + pip3 install --break-system-packages --ignore-installed -r /tmp/requirements.txt RUN ansible-galaxy install -r /tmp/requirements.yml RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* && \ From 893a32fd6e2756de28245061648f23f175320762 Mon Sep 17 00:00:00 2001 From: Florian Ritterhoff <32478819+fritterhoff@users.noreply.github.com> Date: Mon, 11 Dec 2023 06:29:13 +0100 Subject: [PATCH 2/2] ci: build on merge group --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc042fd..f9650d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,6 @@ name: Test image on: + merge_group: pull_request: branches: - main