Skip to content

Commit baa53ff

Browse files
techousetechouse
authored
Merge branch 'main' into feat/add-chopper-requester-package
2 parents 84a7bb5 + d7e5895 commit baa53ff

File tree

37 files changed

+195
-2269
lines changed

37 files changed

+195
-2269
lines changed

‎.yarn/patches/lts-npm-1.2.0-e55f0a54f7.patch

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

‎config/release.config.json

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -26,153 +26,149 @@
2626
"csharp": {
2727
"6.1.17": {
2828
"start": "2024-01-01",
29-
"lts": "2024-01-01",
30-
"end": "2026-08-01"
29+
"end": "2026-07-16",
30+
"status": "active"
3131
},
3232
"7.0.0-beta.8": {
3333
"start": "2024-07-01",
3434
"end": "2026-07-01",
35-
"prerelease": true
35+
"status": "prerelease"
3636
}
3737
},
3838
"dart": {
3939
"1.12.0": {
40-
"start": "2024-06-13",
40+
"start": "2024-06-21",
4141
"end": "2026-06-13",
42-
"maintenance": "2024-06-21"
42+
"status": "maintenance"
4343
},
4444
"1.13.0": {
45-
"start": "2024-06-21",
45+
"start": "2024-06-24",
4646
"end": "2026-06-21",
47-
"prerelease": false,
48-
"maintenance": "2024-06-24"
47+
"status": "maintenance"
4948
},
5049
"1.14.0": {
51-
"start": "2024-06-24",
50+
"start": "2024-06-26",
5251
"end": "2026-06-24",
53-
"prerelease": false,
54-
"maintenance": "2024-06-26"
52+
"status": "maintenance"
5553
},
5654
"1.15.1": {
57-
"start": "2024-06-27",
55+
"start": "2024-07-01",
5856
"end": "2026-06-27",
59-
"prerelease": false,
60-
"maintenance": "2024-07-01"
57+
"status": "maintenance"
6158
},
6259
"1.16.0": {
6360
"start": "2024-07-01",
64-
"lts": "2024-07-01",
6561
"end": "2026-07-01",
66-
"prerelease": false
62+
"status": "active"
6763
}
6864
},
6965
"go": {
7066
"3.31.1": {
7167
"start": "2024-01-01",
72-
"lts": "2024-01-01",
73-
"end": "2026-08-01"
68+
"end": "2026-07-16",
69+
"status": "active"
7470
},
7571
"4.0.0-beta.22": {
7672
"start": "2024-07-01",
7773
"end": "2026-07-01",
78-
"prerelease": true
74+
"status": "prerelease"
7975
}
8076
},
8177
"java": {
8278
"3.16.9": {
8379
"start": "2024-01-01",
84-
"lts": "2024-01-01",
85-
"end": "2026-08-01"
80+
"end": "2026-07-16",
81+
"status": "active"
8682
},
8783
"4.0.0-beta.39": {
8884
"start": "2024-07-01",
8985
"end": "2026-07-01",
90-
"prerelease": true
86+
"status": "prerelease"
9187
}
9288
},
9389
"javascript": {
9490
"4.23.3": {
9591
"start": "2024-01-01",
96-
"lts": "2024-01-01",
97-
"end": "2026-08-01"
92+
"end": "2026-07-16",
93+
"status": "active"
9894
},
9995
"5.0.0-beta.9": {
10096
"start": "2024-07-01",
10197
"end": "2026-07-01",
102-
"prerelease": true
98+
"status": "prerelease"
10399
}
104100
},
105101
"kotlin": {
106102
"2.1.12": {
107103
"start": "2024-01-01",
108-
"lts": "2024-01-01",
109-
"end": "2026-08-01"
104+
"end": "2026-07-16",
105+
"status": "active"
110106
},
111107
"3.0.0-beta.34": {
112108
"start": "2024-07-01",
113109
"end": "2026-07-01",
114-
"prerelease": true
110+
"status": "prerelease"
115111
}
116112
},
117113
"php": {
118114
"3.4.1": {
119115
"start": "2024-01-01",
120-
"lts": "2024-01-01",
121-
"end": "2026-08-01"
116+
"end": "2026-07-16",
117+
"status": "active"
122118
},
123119
"4.0.0-beta.8": {
124120
"start": "2024-07-01",
125121
"end": "2026-07-01",
126-
"prerelease": true
122+
"status": "prerelease"
127123
}
128124
},
129125
"python": {
130126
"3.0.0": {
131127
"start": "2024-01-01",
132-
"lts": "2024-01-01",
133-
"end": "2026-08-01"
128+
"end": "2026-07-16",
129+
"status": "active"
134130
},
135131
"4.0.0b23": {
136132
"start": "2024-07-01",
137133
"end": "2026-07-01",
138-
"prerelease": true
134+
"status": "prerelease"
139135
}
140136
},
141137
"ruby": {
142138
"2.3.4": {
143139
"start": "2024-01-01",
144-
"lts": "2024-01-01",
145-
"end": "2026-08-01"
140+
"end": "2026-07-16",
141+
"status": "active"
146142
},
147143
"3.0.0.beta.8": {
148144
"start": "2024-07-01",
149145
"end": "2026-07-01",
150-
"prerelease": true
146+
"status": "prerelease"
151147
}
152148
},
153149
"scala": {
154150
"1.45.2": {
155151
"start": "2024-01-01",
156-
"lts": "2024-01-01",
157-
"end": "2026-08-01"
152+
"end": "2026-07-16",
153+
"status": "active"
158154
},
159155
"2.0.0-beta.8": {
160156
"start": "2024-07-01",
161157
"end": "2026-07-01",
162-
"prerelease": true
158+
"status": "prerelease"
163159
}
164160
},
165161
"swift": {
166162
"8.20.1": {
167163
"start": "2024-01-01",
168-
"lts": "2024-01-01",
169-
"end": "2026-08-01"
164+
"end": "2026-07-16",
165+
"status": "active"
170166
},
171167
"9.0.0-beta.9": {
172168
"start": "2024-07-01",
173169
"end": "2026-07-01",
174-
"prerelease": true
170+
"status": "prerelease"
175171
}
176172
}
177173
}
178-
}
174+
}

‎scripts/ci/actions/restore-artifacts/builddir/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/ci/actions/restore-artifacts/builddir/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/ci/codegen/pushToAlgoliaDoc.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,9 @@ async function pushToAlgoliaDoc(): Promise<void> {
4444
await run(`git checkout -B ${targetBranch}`, { cwd: tempGitDir });
4545

4646
const pathToSpecs = toAbsolutePath(`${tempGitDir}/app_data/api/specs`);
47-
const pathToImages = toAbsolutePath(`${tempGitDir}/assets/images/api`);
4847
await run(`cp ${toAbsolutePath('specs/bundled/*.doc.yml')} ${pathToSpecs}`);
4948
await run(`cp ${toAbsolutePath('config/release.config.json')} ${pathToSpecs}`);
5049
await run(`cp ${toAbsolutePath('website/src/generated/*.json')} ${pathToSpecs}`);
51-
await run(
52-
`mkdir -p ${pathToImages} && cp ${toAbsolutePath('website/static/img/*-sla.png')} ${pathToImages}`,
53-
);
5450

5551
if ((await getNbGitDiff({ head: null, cwd: tempGitDir })) === 0) {
5652
console.log(`❎ Skipping push docs because there is no change.`);
@@ -77,7 +73,7 @@ async function pushToAlgoliaDoc(): Promise<void> {
7773
title: message,
7874
body: [
7975
'This PR is automatically created by https://github.com/algolia/api-clients-automation',
80-
'It contains the latest released OpenAPI specs, the release SLA dates and PNGs, and the generated code snippets.',
76+
'It contains the latest released OpenAPI specs, the release version support dates, and the generated code snippets.',
8177
].join('\n\n'),
8278
base: 'master',
8379
head: targetBranch,

‎scripts/cli/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { startTestServer } from '../cts/testServer';
99
import { formatter } from '../formatter.js';
1010
import { generate } from '../generate.js';
1111
import { playground } from '../playground.js';
12-
import { createReleasePR, updateSLA } from '../release/createReleasePR.js';
13-
import type { Versions } from '../release/types.js';
12+
import { createReleasePR } from '../release/createReleasePR.js';
1413
import { snippetsGenerateMany } from '../snippets/generate.js';
1514
import { buildSpecs } from '../specs';
1615
import type { Language } from '../types.js';
@@ -214,16 +213,9 @@ program
214213
undefined,
215214
)
216215
.option('-d, --dry-run', 'does not push anything to GitHub')
217-
.option('-gg, --generate-graph', 'only generates the graph')
218-
.action(async (langArgs: LangArg[], { verbose, releaseType, dryRun, generateGraph }) => {
216+
.action(async (langArgs: LangArg[], { verbose, releaseType, dryRun }) => {
219217
setVerbose(Boolean(verbose));
220218

221-
if (generateGraph) {
222-
await updateSLA({} as Versions, true);
223-
224-
return;
225-
}
226-
227219
if (langArgs.length === 0) {
228220
langArgs = [ALL];
229221
}

‎scripts/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"fs-extra": "11.2.0",
4646
"js-yaml": "4.1.0",
4747
"knip": "5.23.2",
48-
"lts": "patch:lts@npm%3A1.2.0#~/.yarn/patches/lts-npm-1.2.0-e55f0a54f7.patch",
4948
"micromatch": "4.0.7",
5049
"semver": "7.6.2",
5150
"spinnies": "0.5.1",

0 commit comments

Comments
 (0)