Merge branch 'benfred:master' into master

WillRosen · Dec 7, 2023 · 640c9c3 · 640c9c3
2 parents 651c664 + 2f8cfdd
commit 640c9c3
Show file tree

Hide file tree

Showing 22 changed files with 438 additions and 143 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,46 +118,48 @@ jobs:
         path: dist
 
   build-freebsd:
-    runs-on: macos-latest
+    runs-on: ubuntu-22.04
     needs: [lint]
     timeout-minutes: 30
     strategy:
       matrix:
-        include:
-          - box: fbsd_13_1
-            release: FreeBSD-13.1-STABLE
-            url: https://github.com/rbspy/freebsd-vagrant-box/releases/download/20221112/fbsd_13_1.box
+        box:
+          - freebsd-14
     steps:
       - uses: actions/checkout@v3
       - name: Cache Vagrant box
         uses: actions/[email protected]
         with:
-          path: ~/.vagrant.d
-          key: ${{ matrix.box }}-vagrant-boxes-20221112-${{ hashFiles('ci/Vagrantfile') }}
+          path: .vagrant.d
+          key: ${{ matrix.box }}-vagrant-boxes-20231115-${{ hashFiles('ci/Vagrantfile') }}
           restore-keys: |
-            ${{ matrix.box }}-vagrant-boxes-20221112-
+            ${{ matrix.box }}-vagrant-boxes-20231115-
       - name: Cache Cargo and build artifacts
         uses: actions/[email protected]
         with:
           path: build-artifacts.tar
-          key: ${{ matrix.box }}-cargo-20221112-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.box }}-cargo-20231115-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            ${{ matrix.box }}-cargo-20221112-
+            ${{ matrix.box }}-cargo-20231115-
+      - name: Display CPU info
+        run: lscpu
+      - name: Install VM tools
+        run: |
+          sudo apt-get install -qq -o=Dpkg::Use-Pty=0 moreutils
+          sudo chronic apt-get install -qq -o=Dpkg::Use-Pty=0 vagrant virtualbox qemu libvirt-daemon-system
       - name: Set up VM
+        shell: sudo bash {0}
         run: |
-          brew install vagrant
-          vagrant plugin install vagrant-vbguest
+          vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-scp
-
           ln -sf ci/Vagrantfile Vagrantfile
-
-          if [ ! -d ~/.vagrant.d/boxes/rbspy-VAGRANTSLASH-${{ matrix.release }} ]; then
-            vagrant box add --no-tty rbspy/${{ matrix.release }} ${{ matrix.url }}
-          fi
-          vagrant up ${{ matrix.box }}
+          vagrant status
+          vagrant up --no-tty --provider libvirt ${{ matrix.box }}
       - name: Build and test
+        shell: sudo bash {0}
         run: vagrant ssh ${{ matrix.box }} -- bash /vagrant/ci/test_freebsd.sh
       - name: Retrieve build artifacts for caching purposes
+        shell: sudo bash {0}
         run: |
           vagrant scp ${{ matrix.box }}:/vagrant/build-artifacts.tar build-artifacts.tar
           ls -ahl build-artifacts.tar
@@ -178,7 +180,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7.17, 2.7.18, 3.5.4, 3.5.9, 3.5.10, 3.6.7, 3.6.8, 3.6.9, 3.6.10, 3.6.11, 3.6.12, 3.6.13, 3.6.14, 3.6.15, 3.7.1, 3.7.2, 3.7.3, 3.7.4, 3.7.5, 3.7.6, 3.7.7, 3.7.8, 3.7.9, 3.7.10, 3.7.11, 3.7.12, 3.7.13, 3.7.14, 3.7.15, 3.7.16, 3.7.17, 3.8.0, 3.8.1, 3.8.2, 3.8.3, 3.8.4, 3.8.5, 3.8.6, 3.8.7, 3.8.8, 3.8.9, 3.8.10, 3.8.11, 3.8.12, 3.8.13, 3.8.14, 3.8.15, 3.8.16, 3.8.17, 3.9.0, 3.9.1, 3.9.2, 3.9.3, 3.9.4, 3.9.5, 3.9.6, 3.9.7, 3.9.8, 3.9.9, 3.9.10, 3.9.11, 3.9.12, 3.9.13, 3.9.14, 3.9.15, 3.9.16, 3.9.17, 3.10.0, 3.10.1, 3.10.2, 3.10.3, 3.10.4, 3.10.5, 3.10.6, 3.10.7, 3.10.8, 3.10.9, 3.10.10, 3.10.11, 3.10.12, 3.11.0, 3.11.1, 3.11.2, 3.11.3, 3.11.4]
+        python-version: [3.5.4, 3.5.9, 3.5.10, 3.6.7, 3.6.8, 3.6.9, 3.6.10, 3.6.11, 3.6.12, 3.6.13, 3.6.14, 3.6.15, 3.7.1, 3.7.2, 3.7.3, 3.7.4, 3.7.5, 3.7.6, 3.7.7, 3.7.8, 3.7.9, 3.7.10, 3.7.11, 3.7.12, 3.7.13, 3.7.14, 3.7.15, 3.7.16, 3.7.17, 3.8.0, 3.8.1, 3.8.2, 3.8.3, 3.8.4, 3.8.5, 3.8.6, 3.8.7, 3.8.8, 3.8.9, 3.8.10, 3.8.11, 3.8.12, 3.8.13, 3.8.14, 3.8.15, 3.8.16, 3.8.17, 3.8.18, 3.9.0, 3.9.1, 3.9.2, 3.9.3, 3.9.4, 3.9.5, 3.9.6, 3.9.7, 3.9.8, 3.9.9, 3.9.10, 3.9.11, 3.9.12, 3.9.13, 3.9.14, 3.9.15, 3.9.16, 3.9.17, 3.9.18, 3.10.0, 3.10.1, 3.10.2, 3.10.3, 3.10.4, 3.10.5, 3.10.6, 3.10.7, 3.10.8, 3.10.9, 3.10.10, 3.10.11, 3.10.12, 3.10.13, 3.11.0, 3.11.1, 3.11.2, 3.11.3, 3.11.4, 3.11.5]
         # TODO: also test windows
         os: [ubuntu-20.04, macos-latest]
         # some versions of python can't be tested on GHA with osx because of SIP:
@@ -193,6 +195,8 @@ jobs:
             python-version: 3.11.3
           - os: macos-latest
             python-version: 3.11.4
+          - os: macos-latest
+            python-version: 3.11.5
 
     steps:
       - uses: actions/checkout@v2