Skip to content

Commit 07aa75c

Browse files
committed
Merge branch 'main' into prerelease
2 parents 569978d + 21bca8f commit 07aa75c

File tree

17 files changed

+2234
-1134
lines changed

17 files changed

+2234
-1134
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Rust
2727
uses: actions-rs/toolchain@v1
2828
with:
29-
toolchain: 1.65.0
29+
toolchain: 1.71.1
3030
components: rustfmt
3131
default: true
3232

.github/workflows/ci.yml

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -10,127 +10,127 @@ on:
1010
- main
1111

1212
jobs:
13-
rust:
14-
runs-on: ubuntu-latest
15-
container: ubuntu:20.04
16-
services:
17-
# Label used to access the service container
18-
postgres:
19-
# Docker Hub image
20-
image: postgres
21-
env:
22-
POSTGRES_PASSWORD: postgres
23-
# Set health checks to wait until postgres has started
24-
options: >-
25-
--health-cmd pg_isready
26-
--health-interval 10s
27-
--health-timeout 5s
28-
--health-retries 5
29-
# mysql
30-
mysql:
31-
image: ghcr.io/wangxiaoying/mysql:latest
32-
env:
33-
MYSQL_DATABASE: mysql
34-
MYSQL_ROOT_PASSWORD: mysql
35-
LANG: C.UTF-8
36-
ports:
37-
- 3306:3306
38-
options: >-
39-
--health-cmd "mysqladmin ping"
40-
--health-interval 10s
41-
--health-timeout 10s
42-
--health-retries 5
43-
mssql:
44-
image: mcr.microsoft.com/mssql/server:2019-latest
45-
env:
46-
ACCEPT_EULA: y
47-
SA_PASSWORD: mssql!Password
48-
ports:
49-
- 1433:1433
50-
options: >-
51-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P \"$SA_PASSWORD\" -Q 'SELECT 1' || exit 1"
52-
--health-interval 10s
53-
--health-timeout 5s
54-
--health-retries 20
55-
steps:
56-
- uses: actions/checkout@v2
13+
# rust:
14+
# runs-on: ubuntu-latest
15+
# container: ubuntu:20.04
16+
# services:
17+
# # Label used to access the service container
18+
# postgres:
19+
# # Docker Hub image
20+
# image: postgres
21+
# env:
22+
# POSTGRES_PASSWORD: postgres
23+
# # Set health checks to wait until postgres has started
24+
# options: >-
25+
# --health-cmd pg_isready
26+
# --health-interval 10s
27+
# --health-timeout 5s
28+
# --health-retries 5
29+
# # mysql
30+
# mysql:
31+
# image: ghcr.io/wangxiaoying/mysql:latest
32+
# env:
33+
# MYSQL_DATABASE: mysql
34+
# MYSQL_ROOT_PASSWORD: mysql
35+
# LANG: C.UTF-8
36+
# ports:
37+
# - 3306:3306
38+
# options: >-
39+
# --health-cmd "mysqladmin ping"
40+
# --health-interval 10s
41+
# --health-timeout 10s
42+
# --health-retries 5
43+
# mssql:
44+
# image: mcr.microsoft.com/mssql/server:2019-latest
45+
# env:
46+
# ACCEPT_EULA: y
47+
# SA_PASSWORD: mssql!Password
48+
# ports:
49+
# - 1433:1433
50+
# options: >-
51+
# --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P \"$SA_PASSWORD\" -Q 'SELECT 1' || exit 1"
52+
# --health-interval 10s
53+
# --health-timeout 5s
54+
# --health-retries 20
55+
# steps:
56+
# - uses: actions/checkout@v2
5757

58-
- name: Install tools
59-
run: |
60-
apt-get update
61-
apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
62-
pip3 install mssql-cli
63-
pip3 install cli-helpers==2.2.0
64-
ln -s /usr/bin/python3 /usr/bin/python
65-
echo "Cache Version ${{ secrets.CACHE_VERSION }}"
66-
env:
67-
DEBIAN_FRONTEND: noninteractive
58+
# - name: Install tools
59+
# run: |
60+
# apt-get update
61+
# apt-get install -y curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client python3 python3-pip libicu66 libkrb5-dev libclang-dev
62+
# pip3 install mssql-cli
63+
# pip3 install cli-helpers==2.2.0
64+
# ln -s /usr/bin/python3 /usr/bin/python
65+
# echo "Cache Version ${{ secrets.CACHE_VERSION }}"
66+
# env:
67+
# DEBIAN_FRONTEND: noninteractive
6868

69-
- name: Install Rust
70-
uses: actions-rs/toolchain@v1
71-
with:
72-
toolchain: 1.65.0
73-
components: rustfmt
74-
default: true
69+
# - name: Install Rust
70+
# uses: actions-rs/toolchain@v1
71+
# with:
72+
# toolchain: 1.71.1
73+
# components: rustfmt
74+
# default: true
7575

76-
- uses: actions/cache@v2
77-
with:
78-
path: |
79-
~/.cargo/bin/
80-
~/.cargo/registry/index/
81-
~/.cargo/registry/cache/
82-
~/.cargo/git/db/
83-
target/
84-
key: ${{ runner.os }}-cargo-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
76+
# - uses: actions/cache@v2
77+
# with:
78+
# path: |
79+
# ~/.cargo/bin/
80+
# ~/.cargo/registry/index/
81+
# ~/.cargo/registry/cache/
82+
# ~/.cargo/git/db/
83+
# target/
84+
# key: ${{ runner.os }}-cargo-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
8585

86-
- name: Install other dependent tools
87-
run: |
88-
if [ ! -f "$HOME/.cargo/bin/just" ]; then curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/.cargo/bin; fi
86+
# - name: Install other dependent tools
87+
# run: |
88+
# if [ ! -f "$HOME/.cargo/bin/just" ]; then curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/.cargo/bin; fi
8989

90-
- name: Seed the database
91-
run: just seed-db
92-
env:
93-
POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
94-
SQLITE_URL: "sqlite:///tmp/test.db"
95-
MYSQL_HOST: mysql
96-
MYSQL_PORT: 3306
97-
MYSQL_DB: mysql
98-
MYSQL_USER: root
99-
MYSQL_PASSWORD: mysql
100-
MSSQL_HOST: mssql
101-
MSSQL_PORT: 1433
102-
MSSQL_DB: tempdb
103-
MSSQL_USER: sa
104-
MSSQL_PASSWORD: mssql!Password
90+
# - name: Seed the database
91+
# run: just seed-db
92+
# env:
93+
# POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
94+
# SQLITE_URL: "sqlite:///tmp/test.db"
95+
# MYSQL_HOST: mysql
96+
# MYSQL_PORT: 3306
97+
# MYSQL_DB: mysql
98+
# MYSQL_USER: root
99+
# MYSQL_PASSWORD: mysql
100+
# MSSQL_HOST: mssql
101+
# MSSQL_PORT: 1433
102+
# MSSQL_DB: tempdb
103+
# MSSQL_USER: sa
104+
# MSSQL_PASSWORD: mssql!Password
105105

106-
- name: Is the code formatted?
107-
uses: actions-rs/cargo@v1
108-
with:
109-
command: fmt
110-
args: --all -- --check -q
106+
# - name: Is the code formatted?
107+
# uses: actions-rs/cargo@v1
108+
# with:
109+
# command: fmt
110+
# args: --all -- --check -q
111111

112-
- name: Clippy linting
113-
uses: actions-rs/cargo@v1
114-
with:
115-
command: clippy
116-
args: --features all
112+
# - name: Clippy linting
113+
# uses: actions-rs/cargo@v1
114+
# with:
115+
# command: clippy
116+
# args: --features all
117117

118-
- name: Check each feature gate
119-
run: just test-feature-gate
118+
# - name: Check each feature gate
119+
# run: just test-feature-gate
120120

121-
- name: Run tests
122-
run: cargo clean && just test
123-
env:
124-
POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
125-
SQLITE_URL: "sqlite:///tmp/test.db"
126-
MYSQL_URL: "mysql://root:mysql@mysql:3306/mysql"
127-
MSSQL_URL: "mssql://sa:mssql!Password@mssql:1433/tempdb"
121+
# - name: Run tests
122+
# run: cargo clean && just test
123+
# env:
124+
# POSTGRES_URL: "postgresql://postgres:postgres@postgres:5432/postgres"
125+
# SQLITE_URL: "sqlite:///tmp/test.db"
126+
# MYSQL_URL: "mysql://root:mysql@mysql:3306/mysql"
127+
# MSSQL_URL: "mssql://sa:mssql!Password@mssql:1433/tempdb"
128128

129-
- name: Test build docs
130-
uses: actions-rs/cargo@v1
131-
with:
132-
command: doc
133-
args: --no-deps --features all
129+
# - name: Test build docs
130+
# uses: actions-rs/cargo@v1
131+
# with:
132+
# command: doc
133+
# args: --no-deps --features all
134134

135135
python:
136136
runs-on: ubuntu-latest
@@ -191,7 +191,7 @@ jobs:
191191
- name: Install Rust
192192
uses: actions-rs/toolchain@v1
193193
with:
194-
toolchain: 1.65.0
194+
toolchain: 1.71.1
195195
components: rustfmt
196196
default: true
197197

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install Rust
1515
uses: actions-rs/toolchain@v1
1616
with:
17-
toolchain: 1.65.0
17+
toolchain: 1.71.1
1818
components: rustfmt
1919
default: true
2020

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
- uses: actions-rs/toolchain@v1
2424
with:
25-
toolchain: 1.65.0
25+
toolchain: 1.71.1
2626
components: rustfmt
2727
target: aarch64-unknown-linux-gnu
2828
default: true
@@ -44,7 +44,7 @@ jobs:
4444
4545
- uses: PyO3/maturin-action@v1
4646
with:
47-
rust-toolchain: 1.65.0
47+
rust-toolchain: 1.71.1
4848
maturin-version: v0.14.15
4949
command: build
5050
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
@@ -58,7 +58,7 @@ jobs:
5858
# rebuild the wheel to incorporate j4rs dependencies
5959
- uses: PyO3/maturin-action@v1
6060
with:
61-
rust-toolchain: 1.65.0
61+
rust-toolchain: 1.71.1
6262
maturin-version: v0.14.15
6363
command: build
6464
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
@@ -101,7 +101,7 @@ jobs:
101101

102102
- uses: actions-rs/toolchain@v1
103103
with:
104-
toolchain: 1.65.0
104+
toolchain: 1.71.1
105105
components: rustfmt
106106
default: true
107107

@@ -117,7 +117,7 @@ jobs:
117117
118118
- uses: PyO3/maturin-action@v1
119119
with:
120-
rust-toolchain: 1.65.0
120+
rust-toolchain: 1.71.1
121121
maturin-version: v0.14.15
122122
command: build
123123
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
@@ -131,7 +131,7 @@ jobs:
131131
# rebuild the wheel to incorporate j4rs dependencies
132132
- uses: PyO3/maturin-action@v1
133133
with:
134-
rust-toolchain: 1.65.0
134+
rust-toolchain: 1.71.1
135135
maturin-version: v0.14.15
136136
command: build
137137
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
@@ -161,7 +161,7 @@ jobs:
161161

162162
- uses: actions-rs/toolchain@v1
163163
with:
164-
toolchain: 1.65.0
164+
toolchain: 1.71.1
165165
components: rustfmt
166166
target: aarch64-apple-darwin
167167
default: true
@@ -178,7 +178,7 @@ jobs:
178178
179179
- uses: PyO3/maturin-action@v1
180180
with:
181-
rust-toolchain: 1.65.0
181+
rust-toolchain: 1.71.1
182182
maturin-version: v0.14.15
183183
command: build
184184
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi
@@ -192,7 +192,7 @@ jobs:
192192
# rebuild the wheel to incorporate j4rs dependencies
193193
- uses: PyO3/maturin-action@v1
194194
with:
195-
rust-toolchain: 1.65.0
195+
rust-toolchain: 1.71.1
196196
maturin-version: v0.14.15
197197
command: build
198198
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi

0 commit comments

Comments
 (0)