Skip to content

Commit f85db5d

Browse files
authored
chore(ci): fallback step name when they are skipped (#3679)
1 parent 5fa7410 commit f85db5d

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

.github/workflows/check.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ jobs:
108108
outputs:
109109
RUN_SCRIPTS: ${{ steps.diff.outputs.GITHUB_ACTIONS_CHANGED > 0 || steps.diff.outputs.SCRIPTS_CHANGED > 0 }}
110110

111+
RUN_WEBSITE: ${{ steps.diff.outputs.WEBSITE_CHANGED > 0 }}
112+
111113
SPECS_MATRIX: ${{ steps.spec-matrix.outputs.MATRIX }}
112114

113115
RUN_GEN: ${{ steps.gen-matrix.outputs.RUN_GEN }}
@@ -184,7 +186,7 @@ jobs:
184186
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
185187
ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}
186188
MONITORING_API_KEY: ${{ secrets.MONITORING_API_KEY }}
187-
name: client javascript@${{ fromJSON(needs.setup.outputs.JAVASCRIPT_DATA).version }}
189+
name: client javascript${{ needs.setup.outputs.RUN_GEN_JAVASCRIPT == 'true' && format('@{0}', fromJSON(needs.setup.outputs.JAVASCRIPT_DATA).version) || '' }}
188190
steps:
189191
- uses: actions/checkout@v4
190192

@@ -408,7 +410,7 @@ jobs:
408410
!contains(needs.*.result, 'failure')
409411
outputs:
410412
success: ${{ steps.setoutput.outputs.success }}
411-
name: client kotlin@${{ fromJSON(needs.setup.outputs.KOTLIN_DATA).version }} macos
413+
name: client kotlin${{ needs.setup.outputs.RUN_MACOS_KOTLIN_BUILD == 'true' && format('@{0}', fromJSON(needs.setup.outputs.KOTLIN_DATA).version) || '' }} macos
412414
steps:
413415
- uses: actions/checkout@v4
414416

@@ -455,7 +457,7 @@ jobs:
455457
MONITORING_API_KEY: ${{ secrets.MONITORING_API_KEY }}
456458
outputs:
457459
success: ${{ steps.setoutput.outputs.success }}
458-
name: client swift@${{ fromJSON(needs.setup.outputs.SWIFT_DATA).version }} macos
460+
name: client swift${{ needs.setup.outputs.RUN_MACOS_SWIFT_CTS == 'true' && format('@{0}', fromJSON(needs.setup.outputs.SWIFT_DATA).version) || '' }} macos
459461
steps:
460462
- uses: actions/checkout@v4
461463

@@ -576,11 +578,11 @@ jobs:
576578
${{ steps.benchmark.outputs.BENCHMARK_SECTION }}
577579
578580
- name: Build website
579-
if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' }}
581+
if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' && needs.setup.outputs.RUN_WEBSITE == 'true' }}
580582
run: yarn website:build
581583

582584
- name: Deploy documentation
583-
if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' }}
585+
if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' && needs.setup.outputs.RUN_WEBSITE == 'true' }}
584586
uses: nwtgck/[email protected]
585587
with:
586588
publish-dir: 'website/build'

scripts/ci/githubActions/utils.ts

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,32 @@ export const COMMON_DEPENDENCIES = {
3636
* Variables starting by `LANGUAGENAME_` will be used in the `createMatrix` to determine
3737
* if a job should be added.
3838
*/
39-
export const DEPENDENCIES = LANGUAGES.reduce(
40-
(finalDependencies, lang) => {
41-
const key = `${lang.toUpperCase()}_CLIENT_CHANGED`;
42-
const langFolder = getLanguageFolder(lang);
39+
export const DEPENDENCIES = {
40+
...LANGUAGES.reduce(
41+
(finalDependencies, lang) => {
42+
const key = `${lang.toUpperCase()}_CLIENT_CHANGED`;
43+
const langFolder = getLanguageFolder(lang);
4344

44-
finalDependencies[key] = [
45-
':!**node_modules',
46-
`templates/${lang}`,
47-
'templates/Bug_report.yml',
48-
'templates/issue.yml',
49-
'templates/LICENSE',
50-
// language related files
51-
langFolder,
52-
getVersionFileForLanguage(lang),
53-
`tests/output/${lang}`,
54-
`:!${langFolder}/.github`,
55-
`:!${langFolder}/README.md`,
56-
];
45+
finalDependencies[key] = [
46+
':!**node_modules',
47+
`templates/${lang}`,
48+
'templates/Bug_report.yml',
49+
'templates/issue.yml',
50+
'templates/LICENSE',
51+
// language related files
52+
langFolder,
53+
getVersionFileForLanguage(lang),
54+
`tests/output/${lang}`,
55+
`:!${langFolder}/.github`,
56+
`:!${langFolder}/README.md`,
57+
];
5758

58-
return finalDependencies;
59-
},
60-
{ ...COMMON_DEPENDENCIES } as Record<string, string[]>,
61-
);
59+
return finalDependencies;
60+
},
61+
{ ...COMMON_DEPENDENCIES } as Record<string, string[]>,
62+
),
63+
WEBSITE_CHANGED: ['website', 'scripts/website', 'package.json', 'netlify.toml'],
64+
};
6265

6366
function getVersionFileForLanguage(lang: Language): string {
6467
// js rely on the nvmrc of the repo

scripts/formatter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export async function formatter(language: string, cwd: string): Promise<void> {
66
switch (language) {
77
case 'csharp':
88
if (cwd.includes('tests') || cwd.includes('snippets')) {
9-
await run('dotnet format && dotnet tool restore && dotnet dotnet-csharpier .', {
9+
await run('dotnet format --no-restore && dotnet tool restore && dotnet dotnet-csharpier .', {
1010
cwd,
1111
language,
1212
});

0 commit comments

Comments
 (0)