Skip to content

Commit caaa1ef

Browse files
theorytheory
committed
Merge develop for v1.3.0
2 parents cc5f938 + 596e57d commit caaa1ef

File tree

125 files changed

+3051
-1279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+3051
-1279
lines changed

‎.github/ubuntu/all-apt-prereqs.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set -e
22

33
sudo apt-get update -qq
4+
sudo apt-get remove -qq mysql-common # https://github.com/actions/virtual-environments/issues/5067#issuecomment-1038752575
45
sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq \
56
libicu-dev gettext aspell-en software-properties-common \
67
curl unixodbc-dev odbcinst unixodbc \

‎.github/ubuntu/exasol.sh‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
set -e
44

5-
version=${1:-7}
6-
echo $version
7-
85
# Download dependencies.
96
if [ -z "$SKIP_DEPENDS" ]; then
107
sudo apt-get update -qq
@@ -17,17 +14,10 @@ mkdir -p /opt/exasol
1714

1815
# Download and unpack Exasol ODBC Driver & EXAplus.
1916
# https://www.exasol.com/portal/display/DOWNLOAD/
20-
if [[ "$version" =~ ^6 ]]; then
21-
curl -sSLO https://www.exasol.com/support/secure/attachment/111075/EXASOL_ODBC-6.2.9.tar.gz
22-
curl -sSLO https://www.exasol.com/support/secure/attachment/111057/EXAplus-6.2.9.tar.gz
23-
sudo tar -xzf EXASOL_ODBC-6.2.9.tar.gz -C /opt/exasol --strip-components 1
24-
sudo tar -xzf EXAplus-6.2.9.tar.gz -C /opt/exasol --strip-components 1
25-
else
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
30-
fi
17+
curl -sSLO https://www.exasol.com/support/secure/attachment/186326/EXASOL_ODBC-7.1.5.tar.gz
18+
curl -sSLO https://www.exasol.com/support/secure/attachment/179176/EXAplus-7.1.4.tar.gz
19+
sudo tar -xzf EXASOL_ODBC-7.1.5.tar.gz -C /opt/exasol --strip-components 1
20+
sudo tar -xzf EXAplus-7.1.4.tar.gz -C /opt/exasol --strip-components 1
3121

3222
# Add to the path.
3323
if [[ ! -z "$GITHUB_PATH" ]]; then

‎.github/ubuntu/mysql.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ set -e
55
# Download dependencies.
66
if [ -z "$SKIP_DEPENDS" ]; then
77
sudo apt-get update -qq
8+
sudo apt-get remove -qq mysql-common # https://github.com/actions/virtual-environments/issues/5067#issuecomment-1038752575
89
sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq mysql-client default-libmysqlclient-dev
910
fi

‎.github/workflows/cockroach.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This workflow tests Sqitch's Cockroach engine on all supported versions of
2+
# Postgres. It runs for pushes and pull requests on the `main`, `develop`,
3+
# `**cockroach**`, and `**engine**` branches.
4+
name: 🪳 Cockroach
5+
on:
6+
push:
7+
branches: [main, develop, "**engine**", "**cockroach**" ]
8+
pull_request:
9+
branches: [main, develop, "**engine**", "**cockroach**" ]
10+
jobs:
11+
Cockroach:
12+
strategy:
13+
matrix:
14+
version: ['22.1', '21.2']
15+
name: 🪳 Cockroach ${{ matrix.version }}
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Start CockroachDB
19+
run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest-v${{ matrix.version }} start-single-node --insecure
20+
- uses: actions/checkout@v2
21+
- name: Setup Perl
22+
id: perl
23+
uses: shogo82148/actions-setup-perl@v1
24+
with: { perl-version: latest }
25+
- name: Cache CPAN Modules
26+
uses: actions/cache@v2
27+
with:
28+
path: local
29+
key: perl-${{ steps.perl.outputs.perl-hash }}
30+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
31+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg
32+
- name: prove
33+
env:
34+
PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
35+
LIVE_COCKROACH_REQUIRED: true
36+
SQITCH_TEST_COCKROACH_URI: db:cockroach://root@localhost:26257/
37+
run: prove -lvr t/cockroach.t

‎.github/workflows/coverage.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# This workflow creates the services and installs the clients in order to run
22
# coverage tests. Each engine must be accessible for a complete coverage report.
3-
# It runs for pushes and pull requests on the main and develop branches.
3+
# It runs for pushes and pull requests on the `main`, `develop`, and `**cover**`
4+
# branches.
45
name: 📈 Coverage
56
on:
67
push:
7-
branches: [main, develop]
8+
branches: [main, develop, "**cover**"]
89
pull_request:
9-
branches: [main, develop]
10+
branches: [main, develop, "**cover**"]
1011
jobs:
1112
Snowflake:
1213
name: 📈 Coverage
@@ -43,6 +44,8 @@ jobs:
4344
image: vertica/vertica-ce:latest
4445
ports: [ 5433 ]
4546
steps:
47+
- name: Start CockroachDB
48+
run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest start-single-node --insecure
4649
- uses: actions/checkout@v2
4750
- name: Setup Clients
4851
env:
@@ -90,6 +93,8 @@ jobs:
9093
LIVE_SQLITE_REQUIRED: true
9194
LIVE_VERTICA_REQUIRED: true
9295
SQITCH_TEST_VSQL_URI: db:vertica://dbadmin@localhost:${{ job.services.vertica.ports[5433] }}/VMart?Driver=Vertica
96+
LIVE_COCKROACH_REQUIRED: true
97+
SQITCH_TEST_COCKROACH_URI: db:cockroach://root@localhost:26257/
9398
run: prove -lrj4 t
9499
- name: Report Coverage
95100
env:

‎.github/workflows/exasol.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,18 @@ jobs:
1111
Exasol:
1212
strategy:
1313
matrix:
14-
include:
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 }
20-
name: ☀️ Exasol ${{ matrix.version }}
14+
exasol: ['7.1', '7.0']
15+
name: ☀️ Exasol ${{ matrix.exasol }}
2116
runs-on: ubuntu-latest
2217
services:
2318
exasol:
24-
image: exasol/docker-db:${{ matrix.image }}
25-
ports: [ "${{ matrix.port }}" ]
19+
image: exasol/docker-db:latest-${{ matrix.exasol }}
20+
ports: [ 8563 ]
2621
options: --privileged
2722
steps:
2823
- uses: actions/checkout@v2
2924
- name: Setup Clients
30-
run: .github/ubuntu/exasol.sh ${{ matrix.version }}
25+
run: .github/ubuntu/exasol.sh
3126
- name: Setup Perl
3227
id: perl
3328
uses: shogo82148/actions-setup-perl@v1
@@ -43,5 +38,5 @@ jobs:
4338
env:
4439
PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
4540
LIVE_EXASOL_REQUIRED: true
46-
SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[matrix.port] }}/?Driver=Exasol;SSLCertificate=SSL_VERIFY_NONE
41+
SQITCH_TEST_EXASOL_URI: db:exasol://sys:[email protected]:${{ job.services.exasol.ports[8563] }}/?Driver=Exasol;SSLCertificate=SSL_VERIFY_NONE
4742
run: prove -lvr t/exasol.t

‎.github/workflows/os.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
# the latest versions of Ubuntu, macOS, and Windows. Think of it as a quick
44
# check for working branches.
55
name: 💿 OS
6-
on: [push, pull_request]
6+
on:
7+
push:
8+
branches: ['*']
9+
pull_request:
710
jobs:
811
OS:
912
strategy:

‎.github/workflows/perl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [[🐧, ubuntu], [🍎, macos], [🪟, windows]]
15-
perl: [ '5.34', '5.32', '5.30', '5.28', '5.26', '5.24', '5.22', '5.20', '5.18', '5.16', '5.14', '5.12' ]
15+
perl: [ '5.36', '5.34', '5.32', '5.30', '5.28', '5.26', '5.24', '5.22', '5.20', '5.18', '5.16', '5.14', '5.12' ]
1616
exclude:
1717
- { os: [🪟, windows], perl: '5.12' } # https://github.com/shogo82148/actions-setup-perl/issues/876
1818
- { os: [🪟, windows], perl: '5.14' } # https://github.com/shogo82148/actions-setup-perl/issues/881

‎.github/workflows/pg.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# This workflow tests Sqitch's PostgreSQL engine on all supported versions of
22
# Postgres. It runs for pushes and pull requests on the `main`, `develop`,
3-
# `**postgres**`, and `**engine**` branches.
3+
# `**postgres**`, `**yugabyte**`, and `**engine**` branches.
44
name: 🐘 Postgres
55
on:
66
push:
7-
branches: [main, develop, "**engine**", "**postgres**" ]
7+
branches: [main, develop, "**engine**", "**postgres**", "**yugabyte**" ]
88
pull_request:
9-
branches: [main, develop, "**engine**", "**postgres**" ]
9+
branches: [main, develop, "**engine**", "**postgres**", "**yugabyte**" ]
1010
jobs:
1111
Postgres:
1212
strategy:

‎.github/workflows/yugabyte.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# This workflow tests Sqitch's PostgreSQL engine on all supported versions of
2+
# YugabyteDB. It runs for pushes and pull requests on the `main`, `develop`,
3+
# `**postgres**`, `**yugabyte**`, and `**engine**` branches.
4+
name: 💫 Yugabyte
5+
on:
6+
push:
7+
branches: [main, develop, "**engine**", "**postgres**", "**yugabyte**" ]
8+
pull_request:
9+
branches: [main, develop, "**engine**", "**postgres**", "**yugabyte**" ]
10+
jobs:
11+
Yugabyte:
12+
strategy:
13+
matrix:
14+
include:
15+
- { version: '2.13', tag: 2.13.2.0-b135 }
16+
- { version: '2.12', tag: 2.12.5.0-b24 }
17+
- { version: '2.8', tag: 2.8.6.0-b12 }
18+
- { version: '2.6', tag: 2.6.18.0-b3 }
19+
name: 💫 Yugabyte ${{ matrix.version }}
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Setup YugabyteDB cluster
23+
id: yugabyte
24+
uses: yugabyte/yugabyte-db-action@master
25+
with:
26+
yb_image_tag: "${{ matrix.tag }}"
27+
- uses: actions/checkout@v2
28+
- name: Setup Perl
29+
id: perl
30+
uses: shogo82148/actions-setup-perl@v1
31+
with: { perl-version: latest }
32+
- name: Cache CPAN Modules
33+
uses: actions/cache@v2
34+
with:
35+
path: local
36+
key: perl-${{ steps.perl.outputs.perl-hash }}
37+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
38+
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends DBD::Pg
39+
- name: prove
40+
env:
41+
PERL5LIB: "${{ github.workspace }}/local/lib/perl5"
42+
LIVE_PG_REQUIRED: true
43+
SQITCH_TEST_PG_URI: db:pg://yugabyte@localhost:${{ steps.yugabyte.outputs.ysql_port }}/
44+
run: prove -lvr t/pg.t

0 commit comments

Comments
 (0)