Hot fix on deployment fix for LLVM-14 PANDA

Author: AndrewQuijano

.github/workflows/publish_docker.yml

@@ -7,7 +7,7 @@ on:
       - stable
 
 env:
-  PANDA_CONTAINER_UBUNTU_VERSION: '20.04'
+  PANDA_CONTAINER_UBUNTU_VERSION: '22.04'
 
 jobs:
   get_version:
@@ -110,7 +110,6 @@ jobs:
     strategy:
       matrix:
         ubuntu_version:
-          - 20.04
           - 22.04
 
     steps:
@@ -132,7 +131,6 @@ jobs:
             [registry."${{ secrets.PANDA_ARC_REGISTRY }}"]
               insecure = true
               http = true
-      
 
       - name: Trust Harbor's self-signed certificate
         run: |
@@ -170,15 +168,14 @@ jobs:
           docker run --rm -v $(pwd):/out packager bash -c "cp /*.whl /pandare.deb /out"
           mv pandare.deb pandare_${{ matrix.ubuntu_version }}.deb
       - name: Upload deb packages as artifacts
-        if: ${{ matrix.ubuntu_version != env.PANDA_CONTAINER_UBUNTU_VERSION }}
         uses: actions/upload-artifact@v4
         with:
           name: pandare_${{ matrix.ubuntu_version }}
           path: panda/debian/pandare*.deb
           if-no-files-found: error
 
       - name: Upload whl package as artifact
-        if: ${{ matrix.ubuntu_version != env.PANDA_CONTAINER_UBUNTU_VERSION }}
+        if: ${{ matrix.ubuntu_version == env.PANDA_CONTAINER_UBUNTU_VERSION }}
         uses: actions/upload-artifact@v4
         with:
           name: pypanda

Dockerfile

@@ -9,6 +9,7 @@ ARG PACKAGE_VERSION="3.1.0"
 ### BASE IMAGE
 FROM ${REGISTRY}/$BASE_IMAGE AS base
 ARG BASE_IMAGE
+ARG CAPSTONE_VERSION
 
 # Copy dependencies lists into container. We copy them all and then do a mv because
 # we need to transform base_image into a windows compatible filename which we can't
@@ -22,12 +23,6 @@ RUN apt-get -qq update && \
 
 COPY ./panda/dependencies/${BASE_IMAGE/:/_}_build.txt /tmp/build_dep.txt
 
-### BUILD IMAGE - STAGE 2
-FROM base AS builder
-ARG BASE_IMAGE
-ARG TARGET_LIST
-ARG CAPSTONE_VERSION
-
 RUN apt-get -qq update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $(cat /tmp/build_dep.txt | grep -o '^[^#]*') && \
     apt-get clean && \
@@ -52,6 +47,10 @@ RUN cd /tmp && \
     dpkg -i /tmp/libosi_${BASE_IMAGE_VERSION}.deb && \
     rm -rf /tmp/libosi_${BASE_IMAGE_VERSION}.deb
 
+### BUILD IMAGE - STAGE 2
+FROM base AS builder
+ARG TARGET_LIST
+
 # Build and install panda
 # Copy repo root directory to /panda, note we explicitly copy in .git directory
 # Note .dockerignore file keeps us from copying things we don't need
@@ -76,7 +75,7 @@ RUN git -C /panda submodule update --init dtc && \
         --prefix=/usr/local \
         --disable-numa \
         --enable-llvm && \
-    rm -rf /panda/.git    
+    rm -rf /panda/.git
 
 RUN PRETEND_VERSION=$(cat /tmp/savedversion) make -C /panda/build -j "$(nproc)"
 
@@ -107,9 +106,6 @@ RUN cd /panda/panda/python/core && \
     python3 create_panda_datatypes.py --install && \
     PRETEND_VERSION=$(cat /tmp/savedversion) python3 -m build --wheel . && \
     PRETEND_VERSION=$(cat /tmp/savedversion) pip install .
-RUN python3 -m pip install --upgrade pip "setuptools<65.6.0" && \
-    python3 -m pip install "pycparser<2.22" && \
-    python3 -m pip install --force-reinstall --no-binary :all: cffi
 
 # BUG: PANDA sometimes fails to generate all the necessary files for PyPANDA. This is a temporary fix to detect and fail when this occurs
 RUN ls -alt $(pip show pandare | grep Location: | awk '{print $2}')/pandare/autogen/

panda/python/tests/requirements.txt

@@ -1,2 +1 @@
 pyelftools==0.27
-capstone==4.0.1