Merge branch 'JonathanSalwan:master' into riscv-support

JonathanSalwan · May 6, 2024 · 8903f3a · 8903f3a
2 parents e155584 + 722d900
commit 8903f3a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 24 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10']
         boost-interface: ['ON', 'OFF']
         capstone-version: ['5.0.1']
     steps:
@@ -69,7 +69,7 @@ jobs:
 
       - name: Install Unicorn
         run: |
-          python -m pip install unicorn==2.0.0
+          python -m pip install unicorn==2.0.1
 
       - name: Install LIEF
         run: |

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -4,10 +4,12 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: macos-latest
+    # macos-13 = x86
+    # macos-14 = arm (M1)
+    runs-on: macos-12
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -33,14 +35,15 @@ jobs:
           unzip z3-4.8.17-x64-osx-10.16.zip
           sudo python -m pip install z3-solver==4.8.17.0
 
-      - name: Download and build GMP
-        run: |
-          wget https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
-          tar xvf gmp-6.2.1.tar.xz
-          cd gmp-6.2.1/
-          ./configure --with-pic
-          make
-          make check
+      # NOTE: Do we really need this?
+      #- name: Download and build GMP
+      #  run: |
+      #    wget https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
+      #    tar xvf gmp-6.2.1.tar.xz
+      #    cd gmp-6.2.1/
+      #    ./configure --with-pic
+      #    make
+      #    make check
 
       - name: Install Ninja
         run: |
@@ -71,7 +74,7 @@ jobs:
 
       - name: Install Unicorn
         run: |
-          sudo python -m pip install unicorn==2.0.0
+          sudo python -m pip install unicorn==2.0.1
 
       - name: Install LIEF
         run: |

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -139,7 +139,9 @@ jobs:
 
 
   build-macos:
-    runs-on: macos-latest
+    # macos-13 = x86
+    # macos-14 = arm (M1)
+    runs-on: macos-12
     strategy:
       matrix:
         python-version: ['3.8', '3.9', '3.10']
@@ -173,14 +175,14 @@ jobs:
         run: |
           sudo python -m pip install build
 
-      - name: Download and build GMP
-        run: |
-          wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
-          tar -xf gmp-6.2.1.tar.xz
-          cd gmp-6.2.1
-          ./configure --enable-cxx
-          make
-          make install
+      #- name: Download and build GMP
+      #  run: |
+      #    wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
+      #    tar -xf gmp-6.2.1.tar.xz
+      #    cd gmp-6.2.1
+      #    ./configure --enable-cxx
+      #    make
+      #    make install
 
       - name: Install Ninja
         run: |

diff --git a/src/examples/python/lifting_dot_format.py b/src/examples/python/lifting_dot_format.py
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 ## -*- coding: utf-8 -*-
 ##
-## $ python lifting_dot_format.py > out.dot ; dot -Tpng ./out.dot -o out.png ; eog out.png
+## $ python3 lifting_dot_format.py > out.dot ; dot -Tpng ./out.dot -o out.png ; eog out.png
 ##
 
 import sys