Build packages sequentially using option files

bthomee · bthomee · commit 3e1edeeef30e · 2025-07-23T18:01:41.000-04:00
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -68,17 +68,17 @@ jobs:
       - name: Build the recipes
         working-directory: recipes
         run: |
-          # Loop over all recipe option files in the `options` directory.
+          # Loop over all recipe option files in the `options` directory. Each
+          # option file contains the path to the recipe and the options to use.
           for opts in ../options/*; do
-              filename=${##../opts/}
+              filename=${##../options/}
               recipe=${filename%.options}
               echo "Building recipe '${recipe}'."
-              conan create . \
+              conan create $(cat opts) \
                   --build=missing \
                   --settings:all=build_type=${{ matrix.build.type }} \
                   --update \
-                  -o shared=False -o fPIC=True \
-                  $(cat $package)
+                  -o shared=False -o fPIC=True
           done
       - name: Upload the recipes (dry-run)
         if: ${{ github.ref_type == 'branch' && github.ref_name != github.event.repository.default_branch }}
diff --git a/options/boost.options b/options/boost.options
@@ -1 +1 @@
-all --version 1.86.0
+boost/all --version 1.86.0
diff --git a/options/date.options b/options/date.options
@@ -1 +1 @@
-all --version=3.0.4 -o header_only=True
+date/all --version=3.0.4 -o header_only=True
diff --git a/options/doctest.options b/options/doctest.options
@@ -1 +1 @@
-2.x.x --version=2.4.11
+doctest/2.x.x --version=2.4.11
diff --git a/options/grpc.options b/options/grpc.options
@@ -1 +1 @@
-all --version=1.72.0 -o secure=True
+grpc/all --version=1.72.0 -o secure=True
diff --git a/options/libarchive.options b/options/libarchive.options
@@ -1,14 +1,14 @@
-all --version=3.8.1 -o with_acl=False \
-                    -o with_bzip2=False \
-                    -o with_cng=False \
-                    -o with_expat=False \
-                    -o with_iconv=False \
-                    -o with_libxml2=False \
-                    -o with_lz4=True \
-                    -o with_lzma=False \
-                    -o with_lzo=False \
-                    -o with_nettle=False \
-                    -o with_openssl=False \
-                    -o with_pcreposix=False \
-                    -o with_xattr=False \
-                    -o with_zlib=False
+libarchive/all --version=3.8.1 -o with_acl=False \
+                               -o with_bzip2=False \
+                               -o with_cng=False \
+                               -o with_expat=False \
+                               -o with_iconv=False \
+                               -o with_libxml2=False \
+                               -o with_lz4=True \
+                               -o with_lzma=False \
+                               -o with_lzo=False \
+                               -o with_nettle=False \
+                               -o with_openssl=False \
+                               -o with_pcreposix=False \
+                               -o with_xattr=False \
+                               -o with_zlib=False
diff --git a/options/lz4.options b/options/lz4.options
@@ -1 +1 @@
-all --version=1.10.0
+lz4/all --version=1.10.0
diff --git a/options/nudb.options b/options/nudb.options
@@ -1 +1 @@
-all --version=2.0.9
+nudb/all --version=2.0.9
diff --git a/options/openssl.options b/options/openssl.options
@@ -1 +1 @@
-1.1.x --version=1.1.1w
+openssl/1.1.x --version=1.1.1w
diff --git a/options/protobuf.options b/options/protobuf.options
@@ -1 +1 @@
-all --version=6.30.1 -o with_zlib=True
+protobuf/all --version=6.30.1 -o with_zlib=True
diff --git a/options/rocksdb.options b/options/rocksdb.options
@@ -1,6 +1,6 @@
-all --version=10.0.1 -o enable_sse=False \
-                     -o lite=False \
-                     -o use_rtti=True \
-                     -o with_jemalloc=False \
-                     -o with_lz4=True \
-                     -o with_snappy=True
+rocksdb/all --version=10.0.1 -o enable_sse=False \
+                             -o lite=False \
+                             -o use_rtti=True \
+                             -o with_jemalloc=False \
+                             -o with_lz4=True \
+                             -o with_snappy=True
diff --git a/options/soci.options b/options/soci.options
@@ -1 +1 @@
-all --version=4.1.2 -o with_sqlite3=True -o with_boost=True
+soci/all --version=4.1.2 -o with_sqlite3=True -o with_boost=True
diff --git a/options/sqlite3.options b/options/sqlite3.options
@@ -1 +1 @@
-all --version=3.49.1
+sqlite3/all --version=3.49.1
diff --git a/options/xxhash.options b/options/xxhash.options
@@ -1 +1 @@
-all --version=0.8.3
+xxhash/all --version=0.8.3
diff --git a/options/zlib.options b/options/zlib.options
@@ -1 +1 @@
-all --version=1.3.1
+zlib/all --version=1.3.1

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version 1.86.0`
	`1`	`+boost/all --version 1.86.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version=3.0.4 -o header_only=True`
	`1`	`+date/all --version=3.0.4 -o header_only=True`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2.x.x --version=2.4.11`
	`1`	`+doctest/2.x.x --version=2.4.11`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version=1.72.0 -o secure=True`
	`1`	`+grpc/all --version=1.72.0 -o secure=True`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version=1.10.0`
	`1`	`+lz4/all --version=1.10.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version=2.0.9`
	`1`	`+nudb/all --version=2.0.9`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1.1.x --version=1.1.1w`
	`1`	`+openssl/1.1.x --version=1.1.1w`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-all --version=6.30.1 -o with_zlib=True`
	`1`	`+protobuf/all --version=6.30.1 -o with_zlib=True`