Commit d54693a
authored
Fix main CI: JFrog mirror bypass and Windows pwsh parse error (#1428)
## Summary
Three CI workflows on `main` have been failing. This PR fixes the root
causes.
### 1. `Integration Tests Workflow - Main Branch` (failing 30+ runs in a
row since Apr 8)
- The cache step uses `path: ~/.m2` with a long-lived restore-key `${{
runner.os }}-m2`. It restores a stale cache from before the JFrog OIDC
migration, whose `~/.m2/settings.xml` (the github-server one written by
`actions/setup-java`) **overwrites** the JFrog mirror config that the
preceding "Configure maven" step just wrote.
- Maven then tries to resolve from `repo.maven.apache.org` directly,
which the protected runner cannot reach: `Could not transfer artifact
... from/to central (https://repo.maven.apache.org/maven2): Remote host
terminated the handshake`.
- **Fix**: narrow `path` to `~/.m2/repository` so `settings.xml` is left
alone (matches the pattern used by `warmMavenCache.yml`).
### 2. `Weekly bug catcher` — same root cause as #1
Same fix in `bugCatcher.yml`.
### 3. `Test JDBC Logging` (Windows jobs failing since Apr 27)
- The "Get JFrog OIDC token" step uses bash syntax (`if [ -z "$X" ]`,
`set -euo pipefail`) but has no `shell:` directive. On Windows runners
the default shell is `pwsh`, which fails parsing the bash `if` with
`Missing '(' after 'if'`. The "Configure maven" step has the same
problem (bash heredoc).
- **Fix**: pin both steps to `shell: bash`. Linux jobs were unaffected
because their default shell is already bash.
## Test plan
- [ ] After merge, confirm `Integration Tests Workflow - Main Branch`
passes on the next push to `main`
- [ ] After merge, confirm `Test JDBC Logging` Windows jobs pass on the
next push to `main`
- [ ] Next scheduled `Weekly bug catcher` run (Mondays 00:00 UTC) is
green
NO_CHANGELOG=true
OVERRIDE_FREEZE=true
This pull request and its description were written by Isaac.
---------
Signed-off-by: Vikrant Puppala <vikrant.puppala@databricks.com>1 parent 618141b commit d54693a
3 files changed
Lines changed: 12 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
84 | | - | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
85 | 89 | | |
86 | 90 | | |
87 | 91 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
| 74 | + | |
73 | 75 | | |
74 | 76 | | |
75 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
88 | | - | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
89 | 93 | | |
90 | 94 | | |
91 | 95 | | |
| |||
0 commit comments