Skip to content

Commit

Permalink
fix(ci): kotlin on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcuts committed Jul 1, 2024
1 parent 0052b1f commit 7f4f789
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ jobs:

client_gen:
timeout-minutes: 20
runs-on: ubuntu-22.04
needs:
- setup
- specs
Expand All @@ -251,6 +250,7 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.setup.outputs.GEN_MATRIX) }}
runs-on: ${{ matrix.client.os }}
env:
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}
Expand Down
1 change: 1 addition & 0 deletions scripts/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module.exports = {
],
'@typescript-eslint/sort-type-union-intersection-members': 0,
'no-param-reassign': 0,
complexity: 0,
'@typescript-eslint/consistent-type-assertions': 0,
},
};
5 changes: 5 additions & 0 deletions scripts/ci/githubActions/createMatrix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ async function createClientMatrix(baseBranch: string): Promise<void> {

const toRun = matrix[language].toRun.join(' ');
let buildCommand = `yarn cli build clients ${language} ${toRun}`;
let os = ['ubuntu-22'];

// some clients have specific files required for testing
switch (language) {
Expand Down Expand Up @@ -120,6 +121,9 @@ async function createClientMatrix(baseBranch: string): Promise<void> {
case 'swift':
testsToStore = `${testsToStore} ${testsRootFolder}/Package.swift`;
break;
case 'kotlin':
os = ['ubuntu-22', 'macos-latest'];
break;
default:
break;
}
Expand All @@ -133,6 +137,7 @@ async function createClientMatrix(baseBranch: string): Promise<void> {
testsToDelete,
testsToStore,
snippetsToStore,
os,
});
}

Expand Down
4 changes: 4 additions & 0 deletions scripts/ci/githubActions/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ export type ClientMatrix = {
* The snippets output path to store in the artifact.
*/
snippetsToStore: string;
/**
* The OS to run the CI on.
*/
os: string[];
}>;
};

Expand Down

0 comments on commit 7f4f789

Please sign in to comment.