Merge branch 'main' into feat/dio-http-client-adapter

algolia · Jul 5, 2024 · 1f29a6a · 1f29a6a
2 parents 3828f68 + d7e5895
commit 1f29a6a
Show file tree

Hide file tree

Showing 37 changed files with 195 additions and 2,269 deletions.
diff --git a/.yarn/patches/lts-npm-1.2.0-e55f0a54f7.patch b/.yarn/patches/lts-npm-1.2.0-e55f0a54f7.patch
diff --git a/config/release.config.json b/config/release.config.json
@@ -26,153 +26,149 @@
     "csharp": {
       "6.1.17": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "7.0.0-beta.8": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "dart": {
       "1.12.0": {
-        "start": "2024-06-13",
+        "start": "2024-06-21",
         "end": "2026-06-13",
-        "maintenance": "2024-06-21"
+        "status": "maintenance"
       },
       "1.13.0": {
-        "start": "2024-06-21",
+        "start": "2024-06-24",
         "end": "2026-06-21",
-        "prerelease": false,
-        "maintenance": "2024-06-24"
+        "status": "maintenance"
       },
       "1.14.0": {
-        "start": "2024-06-24",
+        "start": "2024-06-26",
         "end": "2026-06-24",
-        "prerelease": false,
-        "maintenance": "2024-06-26"
+        "status": "maintenance"
       },
       "1.15.1": {
-        "start": "2024-06-27",
+        "start": "2024-07-01",
         "end": "2026-06-27",
-        "prerelease": false,
-        "maintenance": "2024-07-01"
+        "status": "maintenance"
       },
       "1.16.0": {
         "start": "2024-07-01",
-        "lts": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": false
+        "status": "active"
       }
     },
     "go": {
       "3.31.1": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "4.0.0-beta.22": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "java": {
       "3.16.9": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "4.0.0-beta.39": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "javascript": {
       "4.23.3": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "5.0.0-beta.9": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "kotlin": {
       "2.1.12": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "3.0.0-beta.34": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "php": {
       "3.4.1": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "4.0.0-beta.8": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "python": {
       "3.0.0": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "4.0.0b23": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "ruby": {
       "2.3.4": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "3.0.0.beta.8": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "scala": {
       "1.45.2": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "2.0.0-beta.8": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     },
     "swift": {
       "8.20.1": {
         "start": "2024-01-01",
-        "lts": "2024-01-01",
-        "end": "2026-08-01"
+        "end": "2026-07-16",
+        "status": "active"
       },
       "9.0.0-beta.9": {
         "start": "2024-07-01",
         "end": "2026-07-01",
-        "prerelease": true
+        "status": "prerelease"
       }
     }
   }
-}
+}
diff --git a/scripts/ci/actions/restore-artifacts/builddir/index.js b/scripts/ci/actions/restore-artifacts/builddir/index.js
diff --git a/scripts/ci/actions/restore-artifacts/builddir/index.js.map b/scripts/ci/actions/restore-artifacts/builddir/index.js.map
diff --git a/scripts/ci/codegen/pushToAlgoliaDoc.ts b/scripts/ci/codegen/pushToAlgoliaDoc.ts
@@ -44,13 +44,9 @@ async function pushToAlgoliaDoc(): Promise<void> {
   await run(`git checkout -B ${targetBranch}`, { cwd: tempGitDir });
 
   const pathToSpecs = toAbsolutePath(`${tempGitDir}/app_data/api/specs`);
-  const pathToImages = toAbsolutePath(`${tempGitDir}/assets/images/api`);
   await run(`cp ${toAbsolutePath('specs/bundled/*.doc.yml')} ${pathToSpecs}`);
   await run(`cp ${toAbsolutePath('config/release.config.json')} ${pathToSpecs}`);
   await run(`cp ${toAbsolutePath('website/src/generated/*.json')} ${pathToSpecs}`);
-  await run(
-    `mkdir -p ${pathToImages} && cp ${toAbsolutePath('website/static/img/*-sla.png')} ${pathToImages}`,
-  );
 
   if ((await getNbGitDiff({ head: null, cwd: tempGitDir })) === 0) {
     console.log(`❎ Skipping push docs because there is no change.`);
@@ -77,7 +73,7 @@ async function pushToAlgoliaDoc(): Promise<void> {
     title: message,
     body: [
       'This PR is automatically created by https://github.com/algolia/api-clients-automation',
-      'It contains the latest released OpenAPI specs, the release SLA dates and PNGs, and the generated code snippets.',
+      'It contains the latest released OpenAPI specs, the release version support dates, and the generated code snippets.',
     ].join('\n\n'),
     base: 'master',
     head: targetBranch,

diff --git a/scripts/cli/index.ts b/scripts/cli/index.ts
@@ -9,8 +9,7 @@ import { startTestServer } from '../cts/testServer';
 import { formatter } from '../formatter.js';
 import { generate } from '../generate.js';
 import { playground } from '../playground.js';
-import { createReleasePR, updateSLA } from '../release/createReleasePR.js';
-import type { Versions } from '../release/types.js';
+import { createReleasePR } from '../release/createReleasePR.js';
 import { snippetsGenerateMany } from '../snippets/generate.js';
 import { buildSpecs } from '../specs';
 import type { Language } from '../types.js';
@@ -214,16 +213,9 @@ program
     undefined,
   )
   .option('-d, --dry-run', 'does not push anything to GitHub')
-  .option('-gg, --generate-graph', 'only generates the graph')
-  .action(async (langArgs: LangArg[], { verbose, releaseType, dryRun, generateGraph }) => {
+  .action(async (langArgs: LangArg[], { verbose, releaseType, dryRun }) => {
     setVerbose(Boolean(verbose));
 
-    if (generateGraph) {
-      await updateSLA({} as Versions, true);
-
-      return;
-    }
-
     if (langArgs.length === 0) {
       langArgs = [ALL];
     }

diff --git a/scripts/package.json b/scripts/package.json
@@ -45,7 +45,6 @@
     "fs-extra": "11.2.0",
     "js-yaml": "4.1.0",
     "knip": "5.23.2",
-    "lts": "patch:lts@npm%3A1.2.0#~/.yarn/patches/lts-npm-1.2.0-e55f0a54f7.patch",
     "micromatch": "4.0.7",
     "semver": "7.6.2",
     "spinnies": "0.5.1",