Skip to content

Commit 30e29f5

Browse files
theorytheory
committed
Merge develop for v1.4.0
2 parents ff9aede + 44727b7 commit 30e29f5

123 files changed

Lines changed: 2203 additions & 1224 deletions

File tree

Some content is hidden

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

‎.github/ubuntu/exasol.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ mkdir -p /opt/exasol
1414

1515
# Download and unpack Exasol ODBC Driver & EXAplus.
1616
# https://www.exasol.com/portal/display/DOWNLOAD/
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
17+
curl -sSLO https://x-up.s3.amazonaws.com/7.x/7.1.17/EXASOL_ODBC-7.1.17.tar.gz
18+
curl -sSLO https://x-up.s3.amazonaws.com/7.x/7.1.17/EXAplus-7.1.17.tar.gz
19+
sudo tar -xzf EXASOL_ODBC-7.1.17.tar.gz -C /opt/exasol --strip-components 1
20+
sudo tar -xzf EXAplus-7.1.17.tar.gz -C /opt/exasol --strip-components 1
2121

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

‎.github/ubuntu/oracle.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -e
44

5-
version=21.3.0.0.0
6-
icdr=213000
5+
version=21.9.0.0.0dbru
6+
icdr=219000
77

88
# Install bsdtar, required to get --strip-components for a zip file.
99
if [ -z "$SKIP_DEPENDS" ]; then

‎.github/ubuntu/pg.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PGVERSION=${PGVERSION:=${1:-14}}
66
[[ $PGVERSION =~ ^[0-9]$ ]] && PGVERSION+=.0
77

88
curl -O https://salsa.debian.org/postgresql/postgresql-common/-/raw/master/pgdg/apt.postgresql.org.sh
9-
sudo sh apt.postgresql.org.sh -i -v $PGVERSION
9+
sudo sh apt.postgresql.org.sh -i -t -v $PGVERSION
1010
sudo pg_createcluster --start $PGVERSION test -p 5432 --locale=C -- -A trust -E UTF8
1111

1212
if [[ ! -z "$GITHUB_PATH" ]]; then

‎.github/ubuntu/sqlite.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
set -e
44

5-
SQLITE=${SQLITE:=${1:-3.36.0}}
5+
SQLITE=${SQLITE:=${1:-3.40.1}}
6+
echo "Instaling SQLite $SQLITE"
67

78
# Convert to the SQLITE_VERSION_NUMBER format https://sqlite.org/c3ref/c_source_id.html
89
SQLITE=$(perl -e 'my @v = split /[.]/, shift; printf "%d%02d%02d%02d\n", @v[0..3]' $SQLITE)
@@ -11,7 +12,9 @@ SQLITE=$(perl -e 'my @v = split /[.]/, shift; printf "%d%02d%02d%02d\n", @v[0..3
1112
# 3.18.2, 3.18.1, 3.9.3, and 3.7.11 missing.
1213
# https://sqlite.org/chronology.html
1314
# https://stackoverflow.com/a/37712117/79202
14-
if (( $SQLITE >= 3340100 )); then YEAR=2021
15+
if (( $SQLITE >= 3400200 )); then YEAR=2023
16+
elif (( $SQLITE >= 3370200 )); then YEAR=2022
17+
elif (( $SQLITE >= 3340100 )); then YEAR=2021
1518
elif (( $SQLITE >= 3310000 )); then YEAR=2020
1619
elif (( $SQLITE >= 3270000 )); then YEAR=2019
1720
elif (( $SQLITE >= 3220000 )); then YEAR=2018

‎.github/ubuntu/vertica.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ fi
1111
cat t/odbc/vertica.ini | sudo tee -a /etc/vertica.ini
1212

1313
# https://www.vertica.com/download/vertica/client-drivers/
14-
curl -sSLO https://www.vertica.com/client_drivers/11.0.x/11.0.1-0/vertica-client-11.0.1-0.x86_64.tar.gz
15-
sudo tar -xzf vertica-client-11.0.1-0.x86_64.tar.gz -C /
14+
curl -sSLO https://www.vertica.com/client_drivers/12.0.x/12.0.3-0/vertica-client-12.0.3-0.x86_64.tar.gz
15+
sudo tar -xzf vertica-client-12.0.3-0.x86_64.tar.gz -C /
1616

1717
if [[ ! -z "$GITHUB_PATH" ]]; then
1818
echo "/opt/vertica/bin" >> $GITHUB_PATH

‎.github/workflows/cockroach.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@ jobs:
1111
Cockroach:
1212
strategy:
1313
matrix:
14-
version: ['22.1', '21.2']
14+
# curl https://registry.hub.docker.com/v2/repositories/cockroachdb/cockroach/tags\?page_size\=10000 | jq '.results[].name
15+
version: ['23.1', '22.2', '21.2']
1516
name: 🪳 Cockroach ${{ matrix.version }}
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: Start CockroachDB
1920
run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest-v${{ matrix.version }} start-single-node --insecure
20-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2122
- name: Setup Perl
2223
id: perl
2324
uses: shogo82148/actions-setup-perl@v1
2425
with: { perl-version: latest }
2526
- name: Cache CPAN Modules
26-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2728
with:
2829
path: local
2930
key: perl-${{ steps.perl.outputs.perl-hash }}

‎.github/workflows/coverage.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,24 @@ jobs:
4444
image: vertica/vertica-ce:latest
4545
ports: [ 5433 ]
4646
steps:
47+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
48+
- name: Free Disk Space
49+
run: rm -rf /opt/hostedtoolcache
4750
- name: Start CockroachDB
4851
run: docker run -d -p 26257:26257 cockroachdb/cockroach:latest start-single-node --insecure
49-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
53+
- name: Setup Perl
54+
id: perl
55+
uses: shogo82148/actions-setup-perl@v1
56+
with: { perl-version: latest }
57+
- name: Cache CPAN Modules
58+
uses: actions/cache@v3
59+
with:
60+
path: local
61+
key: perl-${{ steps.perl.outputs.perl-hash }}
62+
- name: Install SQLite
63+
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
64+
run: .github/ubuntu/sqlite.sh
5065
- name: Setup Clients
5166
env:
5267
SKIP_DEPENDS: true
@@ -59,20 +74,8 @@ jobs:
5974
.github/ubuntu/pg.sh
6075
.github/ubuntu/snowflake.sh
6176
.github/ubuntu/vertica.sh
62-
- name: Setup Perl
63-
id: perl
64-
uses: shogo82148/actions-setup-perl@v1
65-
with: { perl-version: latest }
66-
- name: Cache CPAN Modules
67-
uses: actions/cache@v2
68-
with:
69-
path: local
70-
key: perl-${{ steps.perl.outputs.perl-hash }}
7177
- run: cpm install --verbose --show-build-log-on-failure --no-test --with-recommends --cpanfile dist/cpanfile
7278
- 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
73-
- name: Install SQLite
74-
env: { PERL5LIB: "${{ github.workspace }}/local/lib/perl5" }
75-
run: .github/ubuntu/sqlite.sh
7679
- name: Run Tests
7780
env:
7881
PERL5LIB: "${{ github.workspace }}/local/lib/perl5"

‎.github/workflows/exasol.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
ports: [ 8563 ]
2121
options: --privileged
2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3
2424
- name: Setup Clients
2525
run: .github/ubuntu/exasol.sh
2626
- name: Setup Perl
2727
id: perl
2828
uses: shogo82148/actions-setup-perl@v1
2929
with: { perl-version: latest }
3030
- name: Cache CPAN Modules
31-
uses: actions/cache@v2
31+
uses: actions/cache@v3
3232
with:
3333
path: local
3434
key: perl-${{ steps.perl.outputs.perl-hash }}

‎.github/workflows/firebird.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
ISC_PASSWORD: nix
3030
FIREBIRD_DATABASE: sqitchtest.db
3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
3333
- name: Setup Clients
3434
run: .github/ubuntu/firebird.sh
3535
- name: Setup Perl
3636
id: perl
3737
uses: shogo82148/actions-setup-perl@v1
3838
with: { perl-version: latest }
3939
- name: Cache CPAN Modules
40-
uses: actions/cache@v2
40+
uses: actions/cache@v3
4141
with:
4242
path: local
4343
key: perl-${{ steps.perl.outputs.perl-hash }}

‎.github/workflows/mysql.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15+
# curl https://registry.hub.docker.com/v2/repositories/library/mysql/tags\?page_size\=10000 | jq '.results[].name
1516
- { version: '8.0', icon: 🐬, name: MySQL, image: mysql }
1617
- { version: '5.7', icon: 🐬, name: MySQL, image: mysql }
1718
- { version: '5.6', icon: 🐬, name: MySQL, image: mysql }
1819
- { version: '5.5', icon: 🐬, name: MySQL, image: mysql }
20+
# https://registry.hub.docker.com/v2/repositories/library/mariadb/tags\?page_size\=10000 | jq '.results[].name'
21+
- { version: '11.0', icon: 🦭, name: MariaDB, image: mariadb }
22+
- { version: '10.9', icon: 🦭, name: MariaDB, image: mariadb }
1923
- { version: '10.6', icon: 🦭, name: MariaDB, image: mariadb }
2024
- { version: '10.5', icon: 🦭, name: MariaDB, image: mariadb }
2125
- { version: '10.4', icon: 🦭, name: MariaDB, image: mariadb }
@@ -33,17 +37,17 @@ jobs:
3337
image: "${{ matrix.image }}:${{ matrix.version }}"
3438
env: { MYSQL_ALLOW_EMPTY_PASSWORD: yes }
3539
ports: [ 3306 ]
36-
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
40+
options: --health-cmd="healthcheck.sh --innodb_initialized || mysqladmin ping --protocol=tcp" --health-interval=5s --health-timeout=2s --health-retries=3
3741
steps:
38-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
3943
- name: Setup Clients
4044
run: .github/ubuntu/mysql.sh
4145
- name: Setup Perl
4246
id: perl
4347
uses: shogo82148/actions-setup-perl@v1
4448
with: { perl-version: latest }
4549
- name: Cache CPAN Modules
46-
uses: actions/cache@v2
50+
uses: actions/cache@v3
4751
with:
4852
path: local
4953
key: perl-${{ steps.perl.outputs.perl-hash }}

0 commit comments

Comments
 (0)