diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffdac3a21..79baf2305 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,11 @@ jobs: name: Build Linux amd64 wheel (musl) steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive + persist-credentials: false ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Build wheel in Alpine container @@ -31,7 +32,7 @@ jobs: set -ex apk add --no-cache \ build-base bison flex flex-dev gperf \ - tcl-dev readline-dev zlib-dev libffi-dev \ + tcl-dev zlib-dev libffi-dev \ libdwarf-dev elfutils-dev \ python3 python3-dev py3-pip py3-setuptools py3-wheel \ git pkgconf ccache @@ -50,9 +51,8 @@ jobs: # Build the wheel via setup.py pip install --break-system-packages pybind11 cxxheaderparser - _PYOSYS_OVERRIDE_VER=$( - grep "^YOSYS_VER " Makefile | head -1 | sed "s/.*:= *//" | tr "+" "." - ) python3 setup.py bdist_wheel --dist-dir /src/dist + mkdir -p /src/dist + python3 -m pip wheel . --wheel-dir /src/dist ' - uses: actions/upload-artifact@v4 @@ -65,7 +65,7 @@ jobs: name: Build Linux amd64 wheel (manylinux2014, glibc 2.17+) steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive @@ -80,7 +80,7 @@ jobs: quay.io/pypa/manylinux2014_x86_64 bash -c ' set -ex - yum install -y tcl-devel readline-devel zlib-devel libffi-devel \ + yum install -y tcl-devel zlib-devel libffi-devel \ flex gperf ccache patchelf \ elfutils-devel elfutils-libelf-devel libdwarf-devel @@ -104,10 +104,8 @@ jobs: cd /src pip3 install --upgrade pip setuptools wheel pybind11 cxxheaderparser - - _PYOSYS_OVERRIDE_VER=$( - grep "^YOSYS_VER " Makefile | head -1 | sed "s/.*:= *//" | tr "+" "." - ) python3 setup.py bdist_wheel --dist-dir /src/dist-manylinux + mkdir -p dist-manylinux + python3 -m pip wheel . --wheel-dir /src/dist-manylinux # Tag wheel as manylinux2014 pip3 install auditwheel || true @@ -126,10 +124,11 @@ jobs: name: Build macOS arm64 wheel steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 submodules: recursive + persist-credentials: false ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - uses: actions/setup-python@v5 @@ -138,7 +137,7 @@ jobs: - name: Install dependencies run: | - brew install bison flex gperf tcl-tk@8 readline libffi dwarfutils libelf ccache + brew install bison flex gperf tcl-tk@8 libffi dwarfutils libelf ccache pip3 install pybind11 cxxheaderparser setuptools wheel - name: Build Verific tclmain @@ -152,9 +151,8 @@ jobs: run: | export PATH="$(brew --prefix bison)/bin:$(brew --prefix flex)/bin:$PATH" export MACOSX_DEPLOYMENT_TARGET=11.0 - _PYOSYS_OVERRIDE_VER=$( - grep "^YOSYS_VER " Makefile | head -1 | sed "s/.*:= *//" | tr "+" "." - ) python3 setup.py bdist_wheel --dist-dir dist + mkdir -p dist + python3 -m pip wheel . --wheel-dir dist - uses: actions/upload-artifact@v4 with: diff --git a/cmake/SilimateVerific.cmake b/cmake/SilimateVerific.cmake index a4fca0156..d3e642bec 100644 --- a/cmake/SilimateVerific.cmake +++ b/cmake/SilimateVerific.cmake @@ -105,7 +105,7 @@ if (YOSYS_ENABLE_VERIFIC) ${verific_include_dirs} ) target_link_libraries(verific INTERFACE - $> + verific_merged PkgConfig::zlib ) diff --git a/cmake/YosysVersionData.cmake b/cmake/YosysVersionData.cmake index 4eb20ce5d..11ba96174 100644 --- a/cmake/YosysVersionData.cmake +++ b/cmake/YosysVersionData.cmake @@ -1,2 +1,2 @@ set(YOSYS_VERSION_MAJOR 0) -set(YOSYS_VERSION_MINOR 64) +set(YOSYS_VERSION_MINOR 66) diff --git a/silimate-shell.nix b/silimate-shell.nix index 746035ff6..0afe477db 100644 --- a/silimate-shell.nix +++ b/silimate-shell.nix @@ -18,6 +18,7 @@ in pkgs.mkShell { buildInputs = with pkgs; [ + ccache bison flex cmake @@ -43,12 +44,13 @@ pkgs.mkShell { clang iverilog # tests gtkwave # vcd2fst - (python3.withPackages(ps: with ps; [pybind11 cxxheaderparser])) + (python3.withPackages(ps: with ps; [pip wheel pybind11 cxxheaderparser])) gnu-ar gtest ] ++ lib.optionals stdenv.isLinux [ elfutils # provides libdw.so (not to be confused with libdwarf.so) ]; + CMAKE_CXX_COMPILER_LAUNCHER = "ccache"; cmakeFlags = [ "-DCMAKE_C_COMPILER=clang" "-DCMAKE_CXX_COMPILER=clang++" "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_CXX_FLAGS=-O0" "-DYOSYS_WITH_PYTHON:BOOL=ON" ]; }