Reorg packages for easier bisecting

cygporter · Oct 17, 2023 · 6b6d442 · 6b6d442
1 parent 11dc482
commit 6b6d442
Showing 1 changed file with 121 additions and 115 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,120 +13,85 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: default
-            package-list: >
-              asciidoc
-              bash-completion
-              bash-completion-devel
-              cygport
-              dblatex
-              gcc-core
-              gettext
-              gettext-devel
-              gnupg
-              gnupg2
-              libcurl-devel
-              libexpat-devel
-              libiconv
-              libiconv-devel
-              libpcre2-devel
-              libssl-devel
-              perl-Authen-SASL
-              perl-DBD-SQLite
-              perl-IO-Socket-SSL
-              perl-IO-Tty
-              perl-MailTools
-              perl-Net-SMTP-SSL
-              perl-TermReadKey
-              perl-Test-Harness
-              perl-XML-SAX
-              perl-YAML
-              pkg-config
-              subversion-perl
-              time
-              zlib-devel
-          - name: good  # What should be specifically asking for the known-good package combo
-            package-list: >
-              asciidoc
-              bash-completion
-              bash-completion-devel
-              cygport=0.36.1-1
-              dblatex
-              gcc-core
-              gettext
-              gettext-devel
-              gnupg
-              gnupg2
-              libcurl-devel
-              libexpat-devel
-              libiconv
-              libiconv-devel
-              libpcre2-devel
-              libssl-devel
-              make=4.4.1-1
-              perl-Authen-SASL
-              perl-DBD-SQLite
-              perl-IO-Socket-SSL
-              perl-IO-Tty
-              perl-MailTools
-              perl-Net-SMTP-SSL
-              perl-TermReadKey
-              perl-Test-Harness
-              perl-XML-SAX
-              perl-YAML
-              pkg-config
-              python39-attrs=21.2.0-1
-              python39-babel=2.9.1-1
-              python39-iniconfig=1.1.1-2
-              python39-jinja2=3.0.3-1
-              python39-markupsafe=2.0.1-1
-              python39-py=1.11.0-1
-              python39-pytest=6.2.5-2
-              python39-pytz=2022.7.1-1
-              python39-setuptools=59.5.0-1
-              subversion-perl
-              time
-              zlib-devel
-          - name: bad  # Explicitly asking for the known-broken packages
-            package-list: >
-              asciidoc
-              bash-completion
-              bash-completion-devel
-              cygport=0.36.2-1
-              dblatex
-              gcc-core
-              gettext
-              gettext-devel
-              gnupg
-              gnupg2
-              libcurl-devel
-              libexpat-devel
-              libiconv
-              libiconv-devel
-              libpcre2-devel
-              libssl-devel
-              make=4.4.1-2
-              perl-Authen-SASL
-              perl-DBD-SQLite
-              perl-IO-Socket-SSL
-              perl-IO-Tty
-              perl-MailTools
-              perl-Net-SMTP-SSL
-              perl-TermReadKey
-              perl-Test-Harness
-              perl-XML-SAX
-              perl-YAML
-              pkg-config
-              python39-babel=2.12.1-1
-              python39-iniconfig=2.0.0-1
-              python39-jinja2=3.1.2-1
-              python39-markupsafe=2.1.2-1
-              python39-platformdirs=3.1.1-1
-              python39-pytest=7.3.0-1
-              python39-setuptools=67.6.0-1
-              subversion-perl
-              time
-              zlib-devel
+          - name: base
+            cygport: cygport
+            make: ''
+            python39-attrs: ''
+            python39-babel: ''
+            python39-iniconfig: ''
+            python39-jinja2: ''
+            python39-markupsafe: ''
+            python39-platformdirs: ''
+            python39-py: ''
+            python39-pytest: ''
+            python39-pytz: ''
+            python39-setuptools: ''
+          - name: old
+            cygport: cygport=0.36.1-1
+            make: make=4.4.1-1
+            python39-attrs: python39-attrs=21.2.0-1
+            python39-babel: python39-babel=2.9.1-1
+            python39-iniconfig: python39-iniconfig=1.1.1-2
+            python39-jinja2: python39-jinja2=3.0.3-1
+            python39-markupsafe: python39-markupsafe=2.0.1-1
+            python39-platformdirs: ''
+            python39-py: python39-py=1.11.0-1
+            python39-pytest: python39-pytest=6.2.5-2
+            python39-pytz: python39-pytz=2022.7.1-1
+            python39-setuptools: python39-setuptools=59.5.0-1
+          - name: new
+            cygport: cygport=0.36.2-1
+            make: make=4.4.1-2
+            python39-attrs: ''
+            python39-babel: python39-babel=2.12.1-1
+            python39-iniconfig: python39-iniconfig=2.0.0-1
+            python39-jinja2: python39-jinja2=3.1.2-1
+            python39-markupsafe: python39-markupsafe=2.1.2-1
+            python39-platformdirs: python39-platformdirs=3.1.1-1
+            python39-py: ''
+            python39-pytest: python39-pytest=7.3.0-1
+            python39-pytz: ''
+            python39-setuptools: python39-setuptools=67.6.0-1
+          - name: new-except-cygport-and-make
+            cygport: cygport=0.36.1-1
+            make: make=4.4.1-1
+            python39-attrs: ''
+            python39-babel: python39-babel=2.12.1-1
+            python39-iniconfig: python39-iniconfig=2.0.0-1
+            python39-jinja2: python39-jinja2=3.1.2-1
+            python39-markupsafe: python39-markupsafe=2.1.2-1
+            python39-platformdirs: python39-platformdirs=3.1.1-1
+            python39-py: ''
+            python39-pytest: python39-pytest=7.3.0-1
+            python39-pytz: ''
+            python39-setuptools: python39-setuptools=67.6.0-1
+          - name: new-except-cygport
+            cygport: cygport=0.36.1-1
+            make: make=4.4.1-2
+            python39-attrs: ''
+            python39-babel: python39-babel=2.12.1-1
+            python39-iniconfig: python39-iniconfig=2.0.0-1
+            python39-jinja2: python39-jinja2=3.1.2-1
+            python39-markupsafe: python39-markupsafe=2.1.2-1
+            python39-platformdirs: python39-platformdirs=3.1.1-1
+            python39-py: ''
+            python39-pytest: python39-pytest=7.3.0-1
+            python39-pytz: ''
+            python39-setuptools: python39-setuptools=67.6.0-1
+          - name: new-except-make
+            cygport: cygport=0.36.2-1
+            make: make=4.4.1-1
+            python39-attrs: ''
+            python39-babel: python39-babel=2.12.1-1
+            python39-iniconfig: python39-iniconfig=2.0.0-1
+            python39-jinja2: python39-jinja2=3.1.2-1
+            python39-markupsafe: python39-markupsafe=2.1.2-1
+            python39-platformdirs: python39-platformdirs=3.1.1-1
+            python39-py: ''
+            python39-pytest: python39-pytest=7.3.0-1
+            python39-pytz: ''
+            python39-setuptools: python39-setuptools=67.6.0-1
+
       fail-fast: false
     steps:
       - name: Initial Cygwin install
@@ -138,7 +103,48 @@ jobs:
       - name: Install Cygwin build requirements
         uses: me-and/cygwin-install-action@1815ba2218a1401a556f418b4513c850bace4a5d
         with:
-          packages: ${{ matrix.package-list }}
+          packages: >
+            ${{ matrix.cygport }}
+            ${{ matrix.make }}
+            ${{ matrix.python39-attrs }}
+            ${{ matrix.python39-babel }}
+            ${{ matrix.python39-iniconfig }}
+            ${{ matrix.python39-jinja2 }}
+            ${{ matrix.python39-markupsafe }}
+            ${{ matrix.python39-platformdirs }}
+            ${{ matrix.python39-py }}
+            ${{ matrix.python39-pytest }}
+            ${{ matrix.python39-pytz }}
+            ${{ matrix.python39-setuptools }}
+            asciidoc
+            bash-completion
+            bash-completion-devel
+            dblatex
+            gcc-core
+            gettext
+            gettext-devel
+            gnupg
+            gnupg2
+            libcurl-devel
+            libexpat-devel
+            libiconv
+            libiconv-devel
+            libpcre2-devel
+            libssl-devel
+            perl-Authen-SASL
+            perl-DBD-SQLite
+            perl-IO-Socket-SSL
+            perl-IO-Tty
+            perl-MailTools
+            perl-Net-SMTP-SSL
+            perl-TermReadKey
+            perl-Test-Harness
+            perl-XML-SAX
+            perl-YAML
+            pkg-config
+            subversion-perl
+            time
+            zlib-devel
           site: http://ctm.crouchingtigerhiddenfruitbat.org/pub/cygwin/circa/64bit/2023/04/13/213636
           check-sig: false
           upgrade: false