ci: enable more builds

williballenthin · Oct 30, 2024 · 35209df · 35209df
1 parent 605257c
commit 35209df
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,65 +80,65 @@ jobs:
         os: [linux, macos, windows]
         target: [x86_64, aarch64]
         manylinux: [auto]
-        # include:
+        include:
           # manylinux for various platforms, plus x86_64 pypy
-          # - os: linux
-          #   manylinux: auto
-          #   target: i686
-          # - os: linux
-          #   manylinux: auto
-          #   target: aarch64
-          # - os: linux
-          #   manylinux: auto
-          #   target: armv7
-          #   interpreter: 3.9 3.10 3.11 3.12 3.13
-          # - os: linux
-          #   manylinux: auto
-          #   target: ppc64le
-          #   interpreter: 3.9 3.10 3.11 3.12 3.13
-          # - os: linux
-          #   manylinux: auto
-          #   target: s390x
-          #   interpreter: 3.9 3.10 3.11 3.12 3.13
-          # - os: linux
-          #   manylinux: auto
-          #   target: x86_64
-          #   interpreter: pypy3.9 pypy3.10
+          - os: linux
+            manylinux: auto
+            target: i686
+          - os: linux
+            manylinux: auto
+            target: aarch64
+          - os: linux
+            manylinux: auto
+            target: armv7
+            interpreter: 3.9 3.10 3.11 3.12 3.13
+          - os: linux
+            manylinux: auto
+            target: ppc64le
+            interpreter: 3.9 3.10 3.11 3.12 3.13
+          - os: linux
+            manylinux: auto
+            target: s390x
+            interpreter: 3.9 3.10 3.11 3.12 3.13
+          - os: linux
+            manylinux: auto
+            target: x86_64
+            interpreter: pypy3.9 pypy3.10
 
-          # # musllinux
-          # - os: linux
-          #   manylinux: musllinux_1_1
-          #   target: x86_64
-          # - os: linux
-          #   manylinux: musllinux_1_1
-          #   target: aarch64
-          # - os: linux
-          #   manylinux: musllinux_1_1
-          #   target: armv7
+          # musllinux
+          - os: linux
+            manylinux: musllinux_1_1
+            target: x86_64
+          - os: linux
+            manylinux: musllinux_1_1
+            target: aarch64
+          - os: linux
+            manylinux: musllinux_1_1
+            target: armv7
 
-          # # macos;
-          # # all versions x86_64
-          # # arm pypy and older pythons which can't be run on the arm hardware for PGO
-          # - os: macos
-          #   target: x86_64
-          # - os: macos
-          #   target: aarch64
-          #   interpreter: 3.8 3.9 pypy3.9 pypy3.10
+          # macos
+          # all versions x86_64
+          # arm pypy and older pythons which can't be run on the arm hardware for PGO
+          - os: macos
+            target: x86_64
+          - os: macos
+            target: aarch64
+            interpreter: 3.8 3.9 pypy3.9 pypy3.10
 
-          # # windows;
-          # # x86_64 pypy builds are not PGO optimized
-          # # i686 not supported by pypy
-          # # aarch64 only 3.11 and up, also not PGO optimized
-          # - os: windows
-          #   target: x86_64
-          #   interpreter: pypy3.9 pypy3.10
-          # - os: windows
-          #   target: i686
-          #   python-architecture: x86
-          #   interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
-          # - os: windows
-          #   target: aarch64
-          #   interpreter: 3.11 3.12 3.13
+          # windows;
+          # x86_64 pypy builds are not PGO optimized
+          # i686 not supported by pypy
+          # aarch64 only 3.11 and up, also not PGO optimized
+          - os: windows
+            target: x86_64
+            interpreter: pypy3.9 pypy3.10
+          - os: windows
+            target: i686
+            python-architecture: x86
+            interpreter: 3.8 3.9 3.10 3.11 3.12 3.13
+          - os: windows
+            target: aarch64
+            interpreter: 3.11 3.12 3.13
 
         exclude:
           # See above; disabled for now.

diff --git a/core/src/workspace/export/pb.rs b/core/src/workspace/export/pb.rs
@@ -7,10 +7,19 @@
 //     )?;
 //
 // in core/build.rs, and vendored into the source tree here.
+// The build script was subsequently removed.
+//
 // This avoids requiring protoc to be available in the build environment,
 // which is tricky when cross compiling.
 // see: https://github.com/williballenthin/lancelot/blob/dc2293d77f3e26f456f7c058136966b6d7dc8845/core/build.rs#L4
 //
+// In October, 2024, I had tried to use protobuf-src to provide protoc to
+// prost-build, but this was
+//   1) very hard to get working across all platforms in GH Actions, and
+//   2) took a long time to compile (like 4+ minutes).
+// Vendoring is simpler, though it will require some maintenance
+// if we ever update the proto.
+//
 // Don't update this file directly.
 // Update the proto and then re-generate this file.