Skip to content

fix(ci): openapi version APIC-300 #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix(ci): openapi version APIC-300 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a35073
fix(scripts): formatting js on the CI
millotp Feb 28, 2022
5d2b437
remove true
millotp Feb 28, 2022
84308a7
fix version
millotp Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/cache/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ runs:
run: curl -L "https://github.com/google/google-java-format/releases/download/v1.13.0/google-java-format-1.13.0-all-deps.jar" > /tmp/java-formatter.jar

- name: Download openapi generator jar for java (TO REMOVE)
if: ${{ inputs.language == 'java' }}
if: ${{ inputs.language == 'java' || inputs.job == 'cts' }}
shell: bash
run: curl -L "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.3.0.jar" > /tmp/openapi-generator-cli.jar
run: curl -L "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.4.0/openapi-generator-cli-5.4.0.jar" > /tmp/openapi-generator-cli.jar
9 changes: 8 additions & 1 deletion scripts/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@ export const ROOT_DIR = path.resolve(process.cwd(), '..');

export const GENERATORS = Object.fromEntries(
Object.entries(openapitools['generator-cli'].generators).map(([key, gen]) => {
return [key, { ...gen, ...splitGeneratorKey(key) }];
return [
key,
{
...gen,
output: gen.output.replace('#{cwd}/', ''),
...splitGeneratorKey(key),
},
];
})
);

Expand Down
12 changes: 6 additions & 6 deletions scripts/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ async function preGen(
{ language, client, key, output }: Generator,
verbose?: boolean
): Promise<void> {
const folder = output.replace('#{cwd}/', '');
await runIfExists(`./scripts/pre-gen/${language}.sh`, `${folder} ${key}`, {
await runIfExists(`./scripts/pre-gen/${language}.sh`, `${output} ${key}`, {
verbose,
});

Expand Down Expand Up @@ -40,8 +39,7 @@ async function postGen(
{ language, key, output }: Generator,
verbose?: boolean
): Promise<void> {
const folder = output.replace('#{cwd}/', '');
await runIfExists(`./scripts/post-gen/${language}.sh`, `${folder} ${key}`, {
await runIfExists(`./scripts/post-gen/${language}.sh`, `${output} ${key}`, {
verbose,
});
}
Expand All @@ -65,7 +63,7 @@ export async function generate(
spinner.text = `post-gen ${gen.key}`;
await postGen(gen, verbose);

if (gen.language === 'javascript' && CI) {
if (CI && gen.language === 'javascript') {
// because the CI is parallelized, run the formatter for each client
await formatter(gen.language, gen.output, verbose);
}
Expand All @@ -75,9 +73,11 @@ export async function generate(

const langs = [...new Set(generators.map((gen) => gen.language))];
for (const lang of langs) {
if (!CI || lang !== 'javascript') {
if (!(CI && lang === 'javascript')) {
await formatter(lang, getLanguageFolder(lang), verbose);
}

// build common packages
if (lang === 'javascript') {
const spinner = createSpinner(
'cleaning JavaScript client utils',
Expand Down