Skip to content

Commit 63bba81

Browse files
mikolalysenkomikolalysenko
committed
Merge remote-tracking branch 'origin/main' into prfix3/1058
# Conflicts: # crates/socket-patch-core/src/vex/discover/testing/golden.rs
2 parents 56ca23e + 8d7e789 commit 63bba81

39 files changed

Lines changed: 1676 additions & 106 deletions

‎.cargo/config.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@ SOCKET_NO_CONFIG = "1"
3232
# tests opt back in with SOCKET_NO_UPDATE_CHECK=0 plus a wiremock
3333
# SOCKET_UPDATE_BASE_URL.
3434
SOCKET_NO_UPDATE_CHECK = "1"
35+
36+
# No test child (and no dev `cargo run`) may POST telemetry to the real
37+
# public proxy: an unauthenticated run sends its events to
38+
# patches-api.socket.dev, and most spawning suites point no proxy URL at a
39+
# mock. Suites that assert telemetry events opt back in with
40+
# SOCKET_TELEMETRY_DISABLED=0 (or remove it) plus a wiremock endpoint.
41+
SOCKET_TELEMETRY_DISABLED = "1"

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -990,14 +990,14 @@ jobs:
990990
# setup-node step, no version change.
991991
#
992992
# `npm_required` turns the npm suites' "npm not installed" soft-skip
993-
# into a hard failure. Not on Windows: `Command::new("npm")` cannot
994-
# resolve `npm.cmd` there, so that leg still skips (a known gap; see
995-
# docs/testing/npm-compatibility.md).
993+
# into a hard failure, on every OS: the suite resolves npm through
994+
# PATHEXT, so Windows finds the `npm.cmd` shim instead of skipping.
996995
- os: ubuntu-latest
997996
suite: e2e_redirect_npm_build
998997
npm_required: '1'
999998
- os: windows-latest
1000999
suite: e2e_redirect_npm_build
1000+
npm_required: '1'
10011001
- os: ubuntu-latest
10021002
suite: e2e_redirect_rush_sim
10031003
- os: windows-latest
@@ -1252,6 +1252,7 @@ jobs:
12521252
env:
12531253
SOCKET_NO_CONFIG: '1'
12541254
SOCKET_NO_UPDATE_CHECK: '1'
1255+
SOCKET_TELEMETRY_DISABLED: '1'
12551256
# e2e-full runs these same steps over its rows.
12561257
steps: &e2e-steps
12571258
- name: Checkout
@@ -1617,14 +1618,15 @@ jobs:
16171618
SOCKET_PATCH_SBT_E2E_VERSION: ${{ matrix.sbt }}
16181619
E2E_SUITE: ${{ matrix.suite }}
16191620
E2E_TEST_FILTER: ${{ matrix.test_filter || '--ignored' }}
1620-
E2E_JVM_TOOL: ${{ matrix.jvm_tool }}
16211621
E2E_ALLOW_EMPTY: ${{ matrix.allow_empty }}
16221622
shell: bash
16231623
# Runs from the package root with CARGO_MANIFEST_DIR set, as
16241624
# `cargo test` would. `suite` may name several binaries; an
16251625
# `allow_empty` row skips the ones whose test file has not landed.
1626-
# Every suite a Gradle leg runs must run at least one test (per
1627-
# suite, so one suite's tests never hide another's empty filter).
1626+
# Every suite a leg runs must run at least one test (per suite, so
1627+
# one suite's tests never hide another's empty filter): a renamed
1628+
# module, a dropped `#[ignore]` under the default `--ignored`
1629+
# selector or a stale `test_filter` would otherwise pass as 0/0.
16281630
run: |
16291631
set -uo pipefail
16301632
exe=''
@@ -1644,8 +1646,8 @@ jobs:
16441646
continue
16451647
fi
16461648
passed=$(sed -n 's/^test result: .* \([0-9][0-9]*\) passed;.*/\1/p' "$log" | head -n 1)
1647-
if [ "$E2E_JVM_TOOL" = gradle ] && [ "${passed:-0}" = 0 ]; then
1648-
echo "::error::$suite ran no test in this Gradle leg ($E2E_TEST_FILTER)"
1649+
if [ "${passed:-0}" = 0 ]; then
1650+
echo "::error::$suite ran no test in this leg (filter: $E2E_TEST_FILTER). Fix the row's suite or test_filter so it selects the tests it is meant to run."
16491651
status=1
16501652
fi
16511653
done
@@ -1750,6 +1752,7 @@ jobs:
17501752
env:
17511753
SOCKET_NO_CONFIG: '1'
17521754
SOCKET_NO_UPDATE_CHECK: '1'
1755+
SOCKET_TELEMETRY_DISABLED: '1'
17531756
# e2e-full runs these same steps over its rows.
17541757
steps: *e2e-steps
17551758

@@ -1798,6 +1801,7 @@ jobs:
17981801
env:
17991802
SOCKET_NO_CONFIG: '1'
18001803
SOCKET_NO_UPDATE_CHECK: '1'
1804+
SOCKET_TELEMETRY_DISABLED: '1'
18011805
steps: *e2e-steps
18021806

18031807
# ----------------------------------------------------------------------
@@ -2026,6 +2030,7 @@ jobs:
20262030
env:
20272031
SOCKET_NO_CONFIG: '1'
20282032
SOCKET_NO_UPDATE_CHECK: '1'
2033+
SOCKET_TELEMETRY_DISABLED: '1'
20292034
strategy:
20302035
fail-fast: false
20312036
matrix:
@@ -2098,6 +2103,7 @@ jobs:
20982103
env:
20992104
SOCKET_NO_CONFIG: '1'
21002105
SOCKET_NO_UPDATE_CHECK: '1'
2106+
SOCKET_TELEMETRY_DISABLED: '1'
21012107
strategy:
21022108
fail-fast: false
21032109
matrix:
@@ -2118,6 +2124,7 @@ jobs:
21182124
env:
21192125
SOCKET_NO_CONFIG: '1'
21202126
SOCKET_NO_UPDATE_CHECK: '1'
2127+
SOCKET_TELEMETRY_DISABLED: '1'
21212128
strategy:
21222129
fail-fast: false
21232130
matrix:

‎.github/workflows/composer-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ concurrency:
7878
env:
7979
SOCKET_NO_CONFIG: '1'
8080
SOCKET_NO_UPDATE_CHECK: '1'
81+
SOCKET_TELEMETRY_DISABLED: '1'
8182

8283
jobs:
8384
native:

‎.github/workflows/go-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ concurrency:
3636
env:
3737
SOCKET_NO_CONFIG: '1'
3838
SOCKET_NO_UPDATE_CHECK: '1'
39+
SOCKET_TELEMETRY_DISABLED: '1'
3940

4041
jobs:
4142
go:

‎.github/workflows/gradle-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ concurrency:
9595
env:
9696
SOCKET_NO_CONFIG: '1'
9797
SOCKET_NO_UPDATE_CHECK: '1'
98+
SOCKET_TELEMETRY_DISABLED: '1'
9899

99100
jobs:
100101
build:

‎.github/workflows/npm-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
SOCKET_PATCH_NPM_E2E_REQUIRED: '1'
120120
SOCKET_NO_CONFIG: '1'
121121
SOCKET_NO_UPDATE_CHECK: '1'
122+
SOCKET_TELEMETRY_DISABLED: '1'
122123
run: |
123124
chmod +x target/debug/socket-patch target/debug/e2e_redirect_npm_build target/debug/e2e_vendor_npm_build
124125
target/debug/e2e_redirect_npm_build --include-ignored --test-threads 4

‎.github/workflows/pdm-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ concurrency:
5757
env:
5858
SOCKET_NO_CONFIG: '1'
5959
SOCKET_NO_UPDATE_CHECK: '1'
60+
SOCKET_TELEMETRY_DISABLED: '1'
6061
PDM_CHECK_UPDATE: 'false'
6162

6263
jobs:

‎.github/workflows/pipenv-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
env:
8686
SOCKET_NO_CONFIG: '1'
8787
SOCKET_NO_UPDATE_CHECK: '1'
88+
SOCKET_TELEMETRY_DISABLED: '1'
8889
# The runners carry whatever patch release uv ships; the harness
8990
# only needs one 3.8 and one 3.12.
9091
BACKTEST_PY38: '3.8'

‎.github/workflows/pnpm-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ jobs:
120120
SOCKET_PATCH_PNPM_E2E_REQUIRED: '1'
121121
SOCKET_NO_CONFIG: '1'
122122
SOCKET_NO_UPDATE_CHECK: '1'
123+
SOCKET_TELEMETRY_DISABLED: '1'
123124
run: |
124125
chmod +x bin/socket-patch bin/pnpm-e2e bin/pnpm-vendor-e2e
125126
export SOCKET_PATCH_PNPM_E2E_SOCKET_BIN="$PWD/bin/socket-patch"

‎.github/workflows/poetry-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ concurrency:
5050
env:
5151
SOCKET_NO_CONFIG: '1'
5252
SOCKET_NO_UPDATE_CHECK: '1'
53+
SOCKET_TELEMETRY_DISABLED: '1'
5354

5455
jobs:
5556
build:

0 commit comments

Comments
 (0)