Skip to content

Commit 3f910fb

Browse files
authored
feat(schema-compiler): Support .yaml.jinja extension, fix #7018 (#7023)
1 parent c8cfd62 commit 3f910fb

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

.github/workflows/push.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,22 @@ jobs:
302302
fail-fast: false
303303

304304
steps:
305+
- name: Maximize build space (disk space limitations)
306+
run: |
307+
echo "Before"
308+
df -h
309+
sudo apt-get remove -y 'php.*'
310+
sudo apt-get remove -y '^mongodb-.*'
311+
sudo apt-get remove -y '^mysql-.*'
312+
sudo apt-get autoremove -y
313+
sudo apt-get clean
314+
315+
sudo rm -rf /usr/share/dotnet
316+
sudo rm -rf /usr/local/lib/android
317+
sudo rm -rf /opt/ghc
318+
sudo rm -rf /opt/hostedtoolcache/CodeQL
319+
echo "After"
320+
df -h
305321
- name: Checkout
306322
uses: actions/checkout@v3
307323
- name: Install Rust
@@ -425,6 +441,22 @@ jobs:
425441
fail-fast: false
426442

427443
steps:
444+
- name: Maximize build space (disk space limitations)
445+
run: |
446+
echo "Before"
447+
df -h
448+
sudo apt-get remove -y 'php.*'
449+
sudo apt-get remove -y '^mongodb-.*'
450+
sudo apt-get remove -y '^mysql-.*'
451+
sudo apt-get autoremove -y
452+
sudo apt-get clean
453+
454+
sudo rm -rf /usr/share/dotnet
455+
sudo rm -rf /usr/local/lib/android
456+
sudo rm -rf /opt/ghc
457+
sudo rm -rf /opt/hostedtoolcache/CodeQL
458+
echo "After"
459+
df -h
428460
- name: Checkout
429461
uses: actions/checkout@v3
430462
- name: Install Rust

packages/cubejs-schema-compiler/src/compiler/DataSchemaCompiler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ export class DataSchemaCompiler {
233233

234234
if (R.endsWith('.js', file.fileName)) {
235235
this.compileJsFile(file, errorsReport, cubes, contexts, exports, asyncModules, toCompile, compiledFiles);
236-
} else if (R.endsWith('.yml.jinja', file.fileName)) {
236+
} else if (R.endsWith('.yml.jinja', file.fileName) || R.endsWith('.yaml.jinja', file.fileName)) {
237237
this.yamlCompiler.compileYamlWithJinjaFile(
238238
file,
239239
errorsReport,

0 commit comments

Comments
 (0)