Skip to content

Commit de5cd31

Browse files
kashif-mkashif-m
committed
Merge remote-tracking branch 'origin/main' into 6969-feature-expose-tokenize-endpoints
2 parents a02c7da + b71571d commit de5cd31

File tree

241 files changed

+10227
-3205
lines changed

Some content is hidden

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

241 files changed

+10227
-3205
lines changed

‎.github/workflows/CI-pr.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ name: CI-pr
22

33
on:
44
pull_request:
5-
# paths:
6-
# - ".github/workflows/**"
7-
# - "crates/**"
8-
# - "examples/**"
9-
# - "Cargo.lock"
10-
# - "Cargo.toml"
115

126
concurrency:
137
group: ${{ github.workflow }}-${{ github.ref }}
@@ -87,6 +81,7 @@ jobs:
8781
check-msrv:
8882
name: Check compilation on MSRV toolchain
8983
runs-on: ${{ matrix.runner }}
84+
if: ${{ ! startsWith(github.event.pull_request.base.ref, 'hotfix-') }}
9085

9186
env:
9287
# Use `sccache` for caching compilation artifacts
@@ -127,24 +122,24 @@ jobs:
127122
repo-token: ${{ secrets.GITHUB_TOKEN }}
128123

129124
# - name: Install sccache
130-
# uses: taiki-e/install-action@v2.33.28
125+
# uses: taiki-e/install-action@v2
131126
# with:
132127
# tool: sccache
133128
# checksum: true
134-
129+
135130
- name: Install rust cache
136131
uses: Swatinem/[email protected]
137-
with:
138-
save-if: false
132+
with:
133+
save-if: false
139134

140135
- name: Install cargo-hack
141-
uses: taiki-e/install-action@v2.33.28
136+
uses: taiki-e/install-action@v2
142137
with:
143138
tool: cargo-hack
144139
checksum: true
145140

146141
- name: Install just
147-
uses: taiki-e/install-action@v2.41.10
142+
uses: taiki-e/install-action@v2
148143
with:
149144
tool: just
150145
checksum: true
@@ -235,24 +230,24 @@ jobs:
235230
repo-token: ${{ secrets.GITHUB_TOKEN }}
236231

237232
# - name: Install sccache
238-
# uses: taiki-e/install-action@v2.33.28
233+
# uses: taiki-e/install-action@v2
239234
# with:
240235
# tool: sccache
241236
# checksum: true
242237

243238
- name: Install rust cache
244239
uses: Swatinem/[email protected]
245-
with:
246-
save-if: false
240+
with:
241+
save-if: false
247242

248243
- name: Install cargo-hack
249-
uses: taiki-e/install-action@v2.33.28
244+
uses: taiki-e/install-action@v2
250245
with:
251246
tool: cargo-hack
252247
checksum: true
253248

254249
- name: Install just
255-
uses: taiki-e/install-action@v2.41.10
250+
uses: taiki-e/install-action@v2
256251
with:
257252
tool: just
258253
checksum: true
@@ -262,7 +257,7 @@ jobs:
262257
run: .github/scripts/install-jq.sh
263258

264259
# - name: Install cargo-nextest
265-
# uses: taiki-e/install-action@v2.33.28
260+
# uses: taiki-e/install-action@v2
266261
# with:
267262
# tool: cargo-nextest
268263
# checksum: true
@@ -284,11 +279,17 @@ jobs:
284279
fi
285280
286281
- name: Run cargo check
282+
if: ${{ ! startsWith(github.event.pull_request.base.ref, 'hotfix-') }}
287283
shell: bash
288284
env:
289285
GH_TOKEN: ${{ github.token }}
290286
run: just ci_hack
291287

288+
- name: Cargo build release
289+
if: ${{ startsWith(github.event.pull_request.base.ref, 'hotfix-') }}
290+
shell: bash
291+
run: cargo check --features release
292+
292293
typos:
293294
name: Spell check
294295
runs-on: ubuntu-latest
@@ -326,11 +327,11 @@ jobs:
326327

327328
- name: Install rust cache
328329
uses: Swatinem/[email protected]
329-
with:
330-
save-if: false
330+
with:
331+
save-if: false
331332

332333
- name: Install just
333-
uses: taiki-e/install-action@v2.41.10
334+
uses: taiki-e/install-action@v2
334335
with:
335336
tool: just
336337
checksum: true

‎.github/workflows/CI-push.yml

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
# paths:
8-
# - ".github/workflows/**"
9-
# - "crates/**"
10-
# - "examples/**"
11-
# - "Cargo.lock"
12-
# - "Cargo.toml"
137

148
merge_group:
159
types:
@@ -19,6 +13,27 @@ concurrency:
1913
group: ${{ github.workflow }}-${{ github.ref }}
2014
cancel-in-progress: true
2115

16+
env:
17+
# Disable incremental compilation.
18+
#
19+
# Incremental compilation is useful as part of an edit-build-test-edit cycle,
20+
# as it lets the compiler avoid recompiling code that hasn't changed. However,
21+
# on CI, we're not making small edits; we're almost always building the entire
22+
# project from scratch. Thus, incremental compilation on CI actually
23+
# introduces *additional* overhead to support making future builds
24+
# faster...but no future builds will ever occur in any given CI environment.
25+
#
26+
# See https://matklad.github.io/2021/09/04/fast-rust-builds.html#ci-workflow
27+
# for details.
28+
CARGO_INCREMENTAL: 0
29+
# Allow more retries for network requests in cargo (downloading crates) and
30+
# rustup (installing toolchains). This should help to reduce flaky CI failures
31+
# from transient network timeouts or other issues.
32+
CARGO_NET_RETRY: 10
33+
RUSTUP_MAX_RETRIES: 10
34+
# Don't emit giant backtraces in the CI logs.
35+
RUST_BACKTRACE: short
36+
2237
jobs:
2338
formatting:
2439
name: Check formatting
@@ -77,9 +92,9 @@ jobs:
7792
uses: arduino/setup-protoc@v3
7893
with:
7994
repo-token: ${{ secrets.GITHUB_TOKEN }}
80-
95+
8196
# - name: Install sccache
82-
# uses: taiki-e/install-action@v2.33.28
97+
# uses: taiki-e/install-action@v2
8398
# with:
8499
# tool: sccache
85100
# checksum: true
@@ -89,12 +104,13 @@ jobs:
89104
save-if: ${{ github.event_name == 'push' }}
90105

91106
- name: Install cargo-hack
92-
uses: baptiste0928/cargo-install@v2.2.0
107+
uses: taiki-e/install-action@v2
93108
with:
94-
crate: cargo-hack
109+
tool: cargo-hack
110+
checksum: true
95111

96112
- name: Install just
97-
uses: taiki-e/install-action@v2.41.10
113+
uses: taiki-e/install-action@v2
98114
with:
99115
tool: just
100116
checksum: true
@@ -171,18 +187,19 @@ jobs:
171187
repo-token: ${{ secrets.GITHUB_TOKEN }}
172188

173189
# - name: Install sccache
174-
# uses: taiki-e/install-action@v2.33.28
190+
# uses: taiki-e/install-action@v2
175191
# with:
176192
# tool: sccache
177193
# checksum: true
178194

179195
- name: Install cargo-hack
180-
uses: baptiste0928/cargo-install@v2.2.0
196+
uses: taiki-e/install-action@v2.41.10
181197
with:
182-
crate: cargo-hack
198+
tool: cargo-hack
199+
checksum: true
183200

184201
- name: Install just
185-
uses: taiki-e/install-action@v2.41.10
202+
uses: taiki-e/install-action@v2
186203
with:
187204
tool: just
188205
checksum: true
@@ -192,9 +209,10 @@ jobs:
192209
run: .github/scripts/install-jq.sh
193210

194211
# - name: Install cargo-nextest
195-
# uses: baptiste0928/cargo-install@v2.2.0
212+
# uses: taiki-e/install-action@v2
196213
# with:
197-
# crate: cargo-nextest
214+
# tool: cargo-nextest
215+
# checksum: true
198216

199217
- uses: Swatinem/[email protected]
200218
with:

‎.github/workflows/connector-sanity-tests.yml renamed to ‎.github/workflows/archive/connector-sanity-tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ env:
3636
RUSTUP_MAX_RETRIES: 10
3737
# Don't emit giant backtraces in the CI logs.
3838
RUST_BACKTRACE: short
39-
# Use cargo's sparse index protocol
40-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4139

4240
jobs:
4341
test_connectors:
@@ -87,7 +85,7 @@ jobs:
8785
toolchain: stable 2 weeks ago
8886

8987
- uses: Swatinem/[email protected]
90-
with:
88+
with:
9189
save-if: false
9290

9391
- name: Decrypt connector auth file

‎.github/workflows/connector-ui-sanity-tests.yml renamed to ‎.github/workflows/archive/connector-ui-sanity-tests.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ env:
3131
RUSTUP_MAX_RETRIES: 10
3232
# Don't emit giant backtraces in the CI logs.
3333
RUST_BACKTRACE: short
34-
# Use cargo's sparse index protocol
35-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
3634
RUST_MIN_STACK: 10485760
3735

3836
jobs:
@@ -77,7 +75,7 @@ jobs:
7775
if: (github.event_name == 'merge_group') || (github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name)
7876
shell: bash
7977
run: |
80-
echo "Skipped tests as the event is merge_group or pull_request from external repository"
78+
echo "Skipped tests as the event is merge_group or pull_request from external repository"
8179
exit 0
8280
8381
- name: Checkout repository
@@ -123,16 +121,16 @@ jobs:
123121

124122
- name: Build and Cache Rust Dependencies
125123
uses: Swatinem/[email protected]
126-
with:
127-
save-if: false
124+
with:
125+
save-if: false
128126

129127
- name: Install Diesel CLI with Postgres Support
130-
uses: baptiste0928/cargo-install@v2.2.0
128+
uses: baptiste0928/cargo-install@v3.3.0
131129
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
132130
with:
133131
crate: diesel_cli
134132
features: postgres
135-
args: "--no-default-features"
133+
args: --no-default-features
136134

137135
- name: Diesel migration run
138136
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}

‎.github/workflows/auto-release-tag.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎.github/workflows/create-hotfix-branch.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99

1010
steps:
1111
- name: Generate a token
12-
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
1312
id: generate_token
1413
uses: actions/create-github-app-token@v1
1514
with:
@@ -43,4 +42,4 @@ jobs:
4342
else
4443
echo "::error::Failed to create hotfix branch"
4544
exit 1
46-
fi
45+
fi

0 commit comments

Comments
 (0)