Skip to content

Commit cc5f938

Browse files
theorytheory
committed
Merge develop for v1.2.1
2 parents cbb374c + deb1e19 commit cc5f938

28 files changed

+331
-128
lines changed

‎.github/ubuntu/exasol.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ fi
1616
mkdir -p /opt/exasol
1717

1818
# Download and unpack Exasol ODBC Driver & EXAplus.
19+
# https://www.exasol.com/portal/display/DOWNLOAD/
1920
if [[ "$version" =~ ^6 ]]; then
2021
curl -sSLO https://www.exasol.com/support/secure/attachment/111075/EXASOL_ODBC-6.2.9.tar.gz
2122
curl -sSLO https://www.exasol.com/support/secure/attachment/111057/EXAplus-6.2.9.tar.gz
2223
sudo tar -xzf EXASOL_ODBC-6.2.9.tar.gz -C /opt/exasol --strip-components 1
2324
sudo tar -xzf EXAplus-6.2.9.tar.gz -C /opt/exasol --strip-components 1
2425
else
25-
curl -sSLO https://www.exasol.com/support/secure/attachment/169430/EXASOL_ODBC-7.1.2.tar.gz
26-
curl -sSLO https://www.exasol.com/support/secure/attachment/167965/EXAplus-7.1.2.tar.gz
27-
sudo tar -xzf EXASOL_ODBC-7.1.2.tar.gz -C /opt/exasol --strip-components 1
28-
sudo tar -xzf EXAplus-7.1.2.tar.gz -C /opt/exasol --strip-components 1
26+
curl -sSLO https://www.exasol.com/support/secure/attachment/175398/EXASOL_ODBC-7.1.3.tar.gz
27+
curl -sSLO https://www.exasol.com/support/secure/attachment/175394/EXAplus-7.1.3.tar.gz
28+
sudo tar -xzf EXASOL_ODBC-7.1.3.tar.gz -C /opt/exasol --strip-components 1
29+
sudo tar -xzf EXAplus-7.1.3.tar.gz -C /opt/exasol --strip-components 1
2930
fi
3031

3132
# Add to the path.

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,8 @@ jobs:
6565
with:
6666
path: local
6767
key: perl-${{ steps.perl.outputs.perl-hash }}
68-
- name: Download cpanfile
69-
uses: carlosperate/[email protected]
70-
with:
71-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
72-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
73-
- 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
68+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
69+
- 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
7470
- name: Install SQLite
7571
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
7672
run: .github/ubuntu/sqlite.sh

‎.github/workflows/exasol.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- { version: '7.1', image: 'latest-7.1', params: ';SSLCertificate=SSL_VERIFY_NONE' }
16-
- { version: '7.0', image: 'latest-7.0', params: ';SSLCertificate=SSL_VERIFY_NONE' }
17-
# - { version: '6.2', image: 'latest-6.2', params: '' }
18-
# - { version: '6.1', image: 'latest-6.1', params: '' }
19-
# - { version: '6.0', image: '6.0.16-d1', params: '' }
15+
- { version: '7.1', image: 'latest-7.1', port: 8563 }
16+
- { version: '7.0', image: 'latest-7.0', port: 8563 }
17+
# - { version: '6.2', image: 'latest-6.2', port: 8888 }
18+
# - { version: '6.1', image: 'latest-6.1', port: 8888 }
19+
# - { version: '6.0', image: '6.0.16-d1', port: 8888 }
2020
name: ☀️ Exasol ${{ matrix.version }}
2121
runs-on: ubuntu-latest
2222
services:
2323
exasol:
2424
image: exasol/docker-db:${{ matrix.image }}
25-
ports: [ 8563 ]
25+
ports: [ "${{ matrix.port }}" ]
2626
options: --privileged
2727
steps:
2828
- uses: actions/checkout@v2
@@ -37,15 +37,11 @@ jobs:
3737
with:
3838
path: local
3939
key: perl-${{ steps.perl.outputs.perl-hash }}
40-
- name: Download cpanfile
41-
uses: carlosperate/[email protected]
42-
with:
43-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
44-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
40+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
4541
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::ODBC
4642
- name: prove
4743
env:
4844
PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
4945
LIVE_EXASOL_REQUIRED: true
50-
SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[8563] }}/?Driver=Exasol${{ matrix.params }}
46+
SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[matrix.port] }}/?Driver=Exasol;SSLCertificate=SSL_VERIFY_NONE
5147
run: prove -lvr t/exasol.t

‎.github/workflows/firebird.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ jobs:
4141
with:
4242
path: local
4343
key: perl-${{ steps.perl.outputs.perl-hash }}
44-
- name: Download cpanfile
45-
uses: carlosperate/[email protected]
46-
with:
47-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
48-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
44+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
4945
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Firebird
5046
- name: prove
5147
env:

‎.github/workflows/mysql.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ jobs:
4747
with:
4848
path: local
4949
key: perl-${{ steps.perl.outputs.perl-hash }}
50-
- name: Download cpanfile
51-
uses: carlosperate/[email protected]
52-
with:
53-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
54-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
50+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
5551
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::mysql
5652
- name: prove
5753
env:

‎.github/workflows/oracle.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@ jobs:
5151
with:
5252
path: local
5353
key: perl-${{ steps.perl.outputs.perl-hash }}
54-
- name: Download cpanfile
55-
uses: carlosperate/[email protected]
56-
with:
57-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
58-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
54+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
5955
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Oracle
6056
- name: prove
6157
env:

‎.github/workflows/os.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,10 @@ jobs:
2626
with:
2727
path: local
2828
key: perl-${{ steps.perl.outputs.perl-hash }}
29-
- name: Download cpanfile
30-
uses: carlosperate/[email protected]
31-
with:
32-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
3329
# Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
3430
- if: ${{ matrix.os == 'windows' }}
3531
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]
36-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
32+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
3733
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
3834
- name: prove
3935
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }

‎.github/workflows/perl.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,10 @@ jobs:
3030
with:
3131
path: local
3232
key: perl-${{ steps.perl.outputs.perl-hash }}
33-
- name: Download cpanfile
34-
uses: carlosperate/[email protected]
35-
with:
36-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
3733
# Remove Locale::TextDomain if https://github.com/gflohr/libintl-perl/issues/7 fixed and released.
3834
- if: ${{ matrix.os[1] == 'windows' }}
3935
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]
40-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
36+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
4137
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends Test::Spelling Test::Pod Test::Pod::Coverage
4238
- name: prove
4339
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }

‎.github/workflows/pg.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@ jobs:
2525
with:
2626
path: local
2727
key: perl-${{ steps.perl.outputs.perl-hash }}
28-
- name: Download cpanfile
29-
uses: carlosperate/[email protected]
30-
with:
31-
file-url: https://fastapi.metacpan.org/source/DWHEELER/App-Sqitch-v1.1.0/dist/cpanfile
32-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile cpanfile
28+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
3329
# DBD::Pg always build against the Debian packaged client, alas, so go
3430
# ahead and let it be cached. If can figure out how to install the
3531
# version-specific client (https://github.com/bucardo/dbdpg/issues/84),
3632
# use cpm install --global to install DBD::Pg for a version-specific
3733
# build each time.
38-
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg Algorithm::Backoff::Exponential
34+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg
3935
- name: Install Postgres
4036
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
4137
run: .github/ubuntu/pg.sh ${{ matrix.pg }}

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
run: |
3737
echo "user $CPAN_USERNAME" > ~/.pause
3838
echo "password $CPAN_PASSWORD" >> ~/.pause
39+
- name: Set Local Git User and Email
40+
run: |
41+
git config --global user.name "sqitch-github-actions[bot]"
42+
git config --global user.name "sqitch-github-actions[bot]@users.noreply.github.com"
3943
- name: Build and Release on CPAN
4044
id: cpan
4145
env:

0 commit comments

Comments
 (0)