Merge develop for v1.2.1

sqitchers · Dec 5, 2021 · cc5f938 · cc5f938
2 parents cbb374c + deb1e19
commit cc5f938
Show file tree

Hide file tree

Showing 28 changed files with 331 additions and 128 deletions.
diff --git a/.github/ubuntu/exasol.sh b/.github/ubuntu/exasol.sh
@@ -16,16 +16,17 @@ fi
 mkdir -p /opt/exasol
 
 # Download and unpack Exasol ODBC Driver & EXAplus.
+# https://www.exasol.com/portal/display/DOWNLOAD/
 if [[ "$version" =~ ^6 ]]; then
     curl -sSLO https://www.exasol.com/support/secure/attachment/111075/EXASOL_ODBC-6.2.9.tar.gz
     curl -sSLO https://www.exasol.com/support/secure/attachment/111057/EXAplus-6.2.9.tar.gz
     sudo tar -xzf EXASOL_ODBC-6.2.9.tar.gz -C /opt/exasol --strip-components 1
     sudo tar -xzf EXAplus-6.2.9.tar.gz     -C /opt/exasol --strip-components 1
 else
-    curl -sSLO https://www.exasol.com/support/secure/attachment/169430/EXASOL_ODBC-7.1.2.tar.gz
-    curl -sSLO https://www.exasol.com/support/secure/attachment/167965/EXAplus-7.1.2.tar.gz
-    sudo tar -xzf EXASOL_ODBC-7.1.2.tar.gz -C /opt/exasol --strip-components 1
-    sudo tar -xzf EXAplus-7.1.2.tar.gz     -C /opt/exasol --strip-components 1
+    curl -sSLO https://www.exasol.com/support/secure/attachment/175398/EXASOL_ODBC-7.1.3.tar.gz
+    curl -sSLO https://www.exasol.com/support/secure/attachment/175394/EXAplus-7.1.3.tar.gz
+    sudo tar -xzf EXASOL_ODBC-7.1.3.tar.gz -C /opt/exasol --strip-components 1
+    sudo tar -xzf EXAplus-7.1.3.tar.gz     -C /opt/exasol --strip-components 1
 fi
 
 # Add to the path.

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -65,12 +65,8 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBI DBD::ODBC DBD::Firebird DBD::Oracle DBD::mysql DBD::Pg Devel::Cover Devel::Cover::Report::Coveralls Algorithm::Backoff::Exponential
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBI DBD::ODBC DBD::Firebird DBD::Oracle DBD::mysql DBD::Pg Devel::Cover Devel::Cover::Report::Coveralls
       - name: Install SQLite
         env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
         run: .github/ubuntu/sqlite.sh

diff --git a/.github/workflows/exasol.yml b/.github/workflows/exasol.yml
@@ -12,17 +12,17 @@ jobs:
     strategy:
       matrix:
         include:
-          - { version: '7.1', image: 'latest-7.1', params: ';SSLCertificate=SSL_VERIFY_NONE' }
-          - { version: '7.0', image: 'latest-7.0', params: ';SSLCertificate=SSL_VERIFY_NONE' }
-          # - { version: '6.2', image: 'latest-6.2', params: '' }
-          # - { version: '6.1', image: 'latest-6.1', params: '' }
-          # - { version: '6.0', image: '6.0.16-d1',  params: '' }
+          - { version: '7.1', image: 'latest-7.1', port: 8563 }
+          - { version: '7.0', image: 'latest-7.0', port: 8563 }
+          # - { version: '6.2', image: 'latest-6.2', port: 8888 }
+          # - { version: '6.1', image: 'latest-6.1', port: 8888 }
+          # - { version: '6.0', image: '6.0.16-d1',  port: 8888 }
     name: ☀️ Exasol ${{ matrix.version }}
     runs-on: ubuntu-latest
     services:
       exasol:
         image: exasol/docker-db:${{ matrix.image }}
-        ports: [ 8563 ]
+        ports: [ "${{ matrix.port }}" ]
         options: --privileged
     steps:
       - uses: actions/checkout@v2
@@ -37,15 +37,11 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::ODBC
       - name: prove
         env:
           PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
           LIVE_EXASOL_REQUIRED: true
-          SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[8563] }}/?Driver=Exasol${{ matrix.params }}
+          SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[matrix.port] }}/?Driver=Exasol;SSLCertificate=SSL_VERIFY_NONE
         run: prove -lvr t/exasol.t
diff --git a/.github/workflows/firebird.yml b/.github/workflows/firebird.yml
@@ -41,11 +41,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Firebird
       - name: prove
         env:

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -47,11 +47,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::mysql
       - name: prove
         env:

diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -51,11 +51,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Oracle
       - name: prove
         env:

diff --git a/.github/workflows/os.yml b/.github/workflows/os.yml
@@ -26,14 +26,10 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
       # Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
       - if: ${{ matrix.os == 'windows' }}
         run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32 Locale::[email protected]
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
       - name: prove
         env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }

diff --git a/.github/workflows/perl.yml b/.github/workflows/perl.yml
@@ -30,14 +30,10 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
       # Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
       - if: ${{ matrix.os[1] == 'windows' }}
         run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Encode Win32::Console::ANSI Win32API::Net Win32::Locale Win32::ShellQuote DateTime::TimeZone::Local::Win32 Locale::[email protected]
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
       - name: prove
         env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }

diff --git a/.github/workflows/pg.yml b/.github/workflows/pg.yml
@@ -25,17 +25,13 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
         # DBD::Pg always build against the Debian packaged client, alas, so go
         # ahead and let it be cached. If can figure out how to install the
         # version-specific client (https://github.com/bucardo/dbdpg/issues/84),
         # use cpm install --global to install DBD::Pg for a version-specific
         # build each time.
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg Algorithm::Backoff::Exponential
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg
       - name: Install Postgres
         env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
         run: .github/ubuntu/pg.sh ${{ matrix.pg }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,6 +36,10 @@ jobs:
       run: |
         echo "user $CPAN_USERNAME" > ~/.pause
         echo "password $CPAN_PASSWORD" >> ~/.pause
+    - name: Set Local Git User and Email
+      run: |
+        git config --global user.name "sqitch-github-actions[bot]"
+        git config --global user.name "sqitch-github-actions[bot]@users.noreply.github.com"
     - name: Build and Release on CPAN
       id: cpan
       env:

diff --git a/.github/workflows/snowflake.yml b/.github/workflows/snowflake.yml
@@ -23,11 +23,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::ODBC
       - name: prove
         env:

diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
@@ -26,11 +26,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBI
       - name: Install SQLite
         env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }

diff --git a/.github/workflows/vertica.yml b/.github/workflows/vertica.yml
@@ -39,11 +39,7 @@ jobs:
         with:
           path: local
           key: perl-${{ steps.perl.outputs.perl-hash }}
-      - name: Download cpanfile
-        uses: carlosperate/[email protected]
-        with:
-          file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
-      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
+      - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
       - run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::ODBC
       - name: prove
         env:

diff --git a/Changes b/Changes
@@ -1,5 +1,13 @@
 Revision history for Perl extension App::Sqitch
 
+1.2.1  2021-12-05T19:59:45Z
+     - Updated all the live engine tests, aside from Oracle, to test with
+       unique registry names, so as to avoid conflicts when multiple
+       instances are being tested at once. Thanks to Slaven Rezić for the
+       report (#597).
+     - Removed `local` directory from the distribution, accidentally included
+       in v1.2.0. Thanks to gregor herrmann for the report (#600).
+
 1.2.0  2021-11-20T22:45:00Z
      - Fixed partitioned search for deployed changes on Oracle and Exasol to
        correctly support plans with more than 250 changes. Thanks to @Nicqu

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -41,3 +41,4 @@
 
 # Development tools.
 ^xt/
+^local/
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-App/Sqitch version v1.2.0
+App/Sqitch version v1.2.1
 =========================
 
 | Release           | Coverage          | Database                             ||
@@ -150,33 +150,33 @@ SOFTWARE.
 
   [CPAN]:      https://img.shields.io/cpan/v/App-Sqitch?label=%F0%9F%93%9A%20CPAN
   [📚]:        https://metacpan.org/dist/App-Sqitch "Latest version on CPAN"
-  [OSes]:      https://github.com/sqitchers/sqitch/actions/workflows/os.yml/badge.svg?branch=main
+  [OSes]:      https://github.com/sqitchers/sqitch/actions/workflows/os.yml/badge.svg
   [💿]:        https://github.com/sqitchers/sqitch/actions/workflows/os.yml "Tested on Linux, macOS, and Windows"
-  [Exasol]:    https://github.com/sqitchers/sqitch/actions/workflows/exasol.yml/badge.svg?branch=main
+  [Exasol]:    https://github.com/sqitchers/sqitch/actions/workflows/exasol.yml/badge.svg
   [☀️]:         https://github.com/sqitchers/sqitch/actions/workflows/exasol.yml "Tested with Exasol 7.0–7.1"
-  [Oracle]:    https://github.com/sqitchers/sqitch/actions/workflows/oracle.yml/badge.svg?branch=main
+  [Oracle]:    https://github.com/sqitchers/sqitch/actions/workflows/oracle.yml/badge.svg
   [🔮]:        https://github.com/sqitchers/sqitch/actions/workflows/oracle.yml "Tested with Oracle 11, 18, and 21"
   [Docker]:    https://img.shields.io/docker/v/sqitch/sqitch?label=%F0%9F%90%B3%20Docker&sort=semver
   [🐳]:        https://hub.docker.com/r/sqitch/sqitch "Latest version on Docker Hub"
-  [Perl]:      https://github.com/sqitchers/sqitch/actions/workflows/perl.yml/badge.svg?branch=main
+  [Perl]:      https://github.com/sqitchers/sqitch/actions/workflows/perl.yml/badge.svg
   [🧅]:        https://github.com/sqitchers/sqitch/actions/workflows/perl.yml "Tested with Perl 5.12–5.34"
-  [Firebird]:  https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml/badge.svg?branch=main
+  [Firebird]:  https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml/badge.svg
   [🔥]:        https://github.com/sqitchers/sqitch/actions/workflows/firebird.yml "Tested with Firebird 2.5, 3, and 4"
-  [Snowflake]: https://github.com/sqitchers/sqitch/actions/workflows/snowflake.yml/badge.svg?branch=main
+  [Snowflake]: https://github.com/sqitchers/sqitch/actions/workflows/snowflake.yml/badge.svg
   [❄️]:         https://github.com/sqitchers/sqitch/actions/workflows/snowflake.yml "Tested with Snowflake"
   [Homebrew]:  https://img.shields.io/github/v/tag/sqitchers/homebrew-sqitch?label=%F0%9F%8D%BA%20Homebrew&sort=semver
   [🍺]:        https://github.com/sqitchers/homebrew-sqitch#readme "Latest Homebrew Tap version"
-  [Coverage]:  https://img.shields.io/coveralls/github/sqitchers/sqitch/main?label=%F0%9F%93%88%20Coverage
+  [Coverage]:  https://img.shields.io/coveralls/github/sqitchers/sqitch?label=%F0%9F%93%88%20Coverage
   [📈]:        https://coveralls.io/r/sqitchers/sqitch "Test Coverage"
-  [MySQL]:     https://github.com/sqitchers/sqitch/actions/workflows/mysql.yml/badge.svg?branch=main
+  [MySQL]:     https://github.com/sqitchers/sqitch/actions/workflows/mysql.yml/badge.svg
   [🐬]:        https://github.com/sqitchers/sqitch/actions/workflows/mysql.yml "Tested with MySQL 5.5–8 and MariaDB 10.0–10.6"
-  [SQLite]:    https://github.com/sqitchers/sqitch/actions/workflows/sqlite.yml/badge.svg?branch=main
+  [SQLite]:    https://github.com/sqitchers/sqitch/actions/workflows/sqlite.yml/badge.svg
   [💡]:        https://github.com/sqitchers/sqitch/actions/workflows/sqlite.yml "Tested with SQLite 3.7–3.36"
   [Debian]:    https://img.shields.io/debian/v/sqitch?label=%F0%9F%8D%A5%20Debian
   [🍥]:        https://packages.debian.org/stable/sqitch "Latest version on Debian"
-  [Postgres]:  https://github.com/sqitchers/sqitch/actions/workflows/pg.yml/badge.svg?branch=main
+  [Postgres]:  https://github.com/sqitchers/sqitch/actions/workflows/pg.yml/badge.svg
   [🐘]:        https://github.com/sqitchers/sqitch/actions/workflows/pg.yml "Tested with PostgreSQL 9.3–14"
-  [Vertica]:   https://github.com/sqitchers/sqitch/actions/workflows/vertica.yml/badge.svg?branch=main
+  [Vertica]:   https://github.com/sqitchers/sqitch/actions/workflows/vertica.yml/badge.svg
   [🔺]:        https://github.com/sqitchers/sqitch/actions/workflows/vertica.yml "Tested with Vertica 7.1–11.0"
 
   [Sqitch]: https://sqitch.org/

diff --git a/dist.ini b/dist.ini
@@ -2,9 +2,11 @@ name = App-Sqitch
 license = MIT
 copyright_holder = "iovation Inc., David E. Wheeler"
 copyright_year = 2012-2021
-version = v1.2.0
+version = v1.2.1
 
 [GatherDir]
+exclude_filename = dist/cpanfile
+
 [PruneCruft]
 [ManifestSkip]
 [MetaYAML]
@@ -23,6 +25,9 @@ version = v1.2.0
 [CPANFile]
 filename = dist/cpanfile
 
+[CopyFilesFromBuild]
+copy = dist/cpanfile
+
 [LocaleTextDomain]
 share_dir = lib
 
@@ -38,6 +43,14 @@ repository.url = https://github.com/sqitchers/sqitch/
 homepage = https://sqitch.org/
 bugtracker.web = https://github.com/sqitchers/sqitch/issues/
 
+[Git::Check]
+allow_dirty = cpanfile
+
+[Git::Commit]
+allow_dirty = cpanfile
+
+[Git::Push]
+
 [AutoPrereqs]
 skip = ^Win32
 skip = ^DBD::