Split templates and generated configs

Author: alcaeus

.evergreen/config.yml

@@ -46,37 +46,37 @@ include:
   - filename: .evergreen/config/test-variants.yml
 
   # Automatically generated files
-  - filename: .evergreen/config/build/build-php-8.2.yml
-  - filename: .evergreen/config/build/build-php-8.1.yml
-  - filename: .evergreen/config/build/build-php-8.0.yml
-  - filename: .evergreen/config/build/build-php-7.4.yml
-  - filename: .evergreen/config/build/build-libmongoc-8.2.yml
-  - filename: .evergreen/config/test/local-latest.yml
-  - filename: .evergreen/config/test/local-rapid.yml
-  - filename: .evergreen/config/test/local-7.0.yml
-  - filename: .evergreen/config/test/local-6.0.yml
-  - filename: .evergreen/config/test/local-5.0.yml
-  - filename: .evergreen/config/test/local-4.4.yml
-  - filename: .evergreen/config/test/local-4.2.yml
-  - filename: .evergreen/config/test/local-4.0.yml
-  - filename: .evergreen/config/test/local-3.6.yml
-  - filename: .evergreen/config/test/load-balanced-latest.yml
-  - filename: .evergreen/config/test/load-balanced-rapid.yml
-  - filename: .evergreen/config/test/load-balanced-7.0.yml
-  - filename: .evergreen/config/test/load-balanced-6.0.yml
-  - filename: .evergreen/config/test/load-balanced-5.0.yml
-  - filename: .evergreen/config/test/ocsp-latest.yml
-  - filename: .evergreen/config/test/ocsp-rapid.yml
-  - filename: .evergreen/config/test/ocsp-7.0.yml
-  - filename: .evergreen/config/test/ocsp-6.0.yml
-  - filename: .evergreen/config/test/ocsp-5.0.yml
-  - filename: .evergreen/config/test/ocsp-4.4.yml
-  - filename: .evergreen/config/test/require-api-version-latest.yml
-  - filename: .evergreen/config/test/require-api-version-rapid.yml
-  - filename: .evergreen/config/test/require-api-version-7.0.yml
-  - filename: .evergreen/config/test/require-api-version-6.0.yml
-  - filename: .evergreen/config/test/require-api-version-5.0.yml
-  - filename: .evergreen/config/test/skip-crypt-shared-latest.yml
-  - filename: .evergreen/config/test/skip-crypt-shared-rapid.yml
-  - filename: .evergreen/config/test/skip-crypt-shared-7.0.yml
-  - filename: .evergreen/config/test/skip-crypt-shared-6.0.yml
+  - filename: .evergreen/config/generated/build/build-php-8.2.yml
+  - filename: .evergreen/config/generated/build/build-php-8.1.yml
+  - filename: .evergreen/config/generated/build/build-php-8.0.yml
+  - filename: .evergreen/config/generated/build/build-php-7.4.yml
+  - filename: .evergreen/config/generated/build/build-libmongoc-8.2.yml
+  - filename: .evergreen/config/generated/test/local-latest.yml
+  - filename: .evergreen/config/generated/test/local-rapid.yml
+  - filename: .evergreen/config/generated/test/local-7.0.yml
+  - filename: .evergreen/config/generated/test/local-6.0.yml
+  - filename: .evergreen/config/generated/test/local-5.0.yml
+  - filename: .evergreen/config/generated/test/local-4.4.yml
+  - filename: .evergreen/config/generated/test/local-4.2.yml
+  - filename: .evergreen/config/generated/test/local-4.0.yml
+  - filename: .evergreen/config/generated/test/local-3.6.yml
+  - filename: .evergreen/config/generated/test/load-balanced-latest.yml
+  - filename: .evergreen/config/generated/test/load-balanced-rapid.yml
+  - filename: .evergreen/config/generated/test/load-balanced-7.0.yml
+  - filename: .evergreen/config/generated/test/load-balanced-6.0.yml
+  - filename: .evergreen/config/generated/test/load-balanced-5.0.yml
+  - filename: .evergreen/config/generated/test/ocsp-latest.yml
+  - filename: .evergreen/config/generated/test/ocsp-rapid.yml
+  - filename: .evergreen/config/generated/test/ocsp-7.0.yml
+  - filename: .evergreen/config/generated/test/ocsp-6.0.yml
+  - filename: .evergreen/config/generated/test/ocsp-5.0.yml
+  - filename: .evergreen/config/generated/test/ocsp-4.4.yml
+  - filename: .evergreen/config/generated/test/require-api-version-latest.yml
+  - filename: .evergreen/config/generated/test/require-api-version-rapid.yml
+  - filename: .evergreen/config/generated/test/require-api-version-7.0.yml
+  - filename: .evergreen/config/generated/test/require-api-version-6.0.yml
+  - filename: .evergreen/config/generated/test/require-api-version-5.0.yml
+  - filename: .evergreen/config/generated/test/skip-crypt-shared-latest.yml
+  - filename: .evergreen/config/generated/test/skip-crypt-shared-rapid.yml
+  - filename: .evergreen/config/generated/test/skip-crypt-shared-7.0.yml
+  - filename: .evergreen/config/generated/test/skip-crypt-shared-6.0.yml

.evergreen/config/generate-config.php

@@ -51,15 +51,15 @@
 $allFiles = [];
 
 // Build tasks
-$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-php.yml', 'build-php-%s', $supportedPhpVersions);
-$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-libmongoc.yml', 'build-libmongoc-%s', $libmongocBuildPhpVersions);
+$allFiles[] = generateConfigs('build', 'phpVersion', 'build-php.yml', 'build-php-%s', $supportedPhpVersions);
+$allFiles[] = generateConfigs('build', 'phpVersion', 'build-libmongoc.yml', 'build-libmongoc-%s', $libmongocBuildPhpVersions);
 
 // Test tasks
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-local.yml', 'local-%s', $localServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-ocsp.yml', 'ocsp-%s', $ocspServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'local.yml', 'local-%s', $localServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'ocsp.yml', 'ocsp-%s', $ocspServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions);
 
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n";
@@ -76,13 +76,17 @@ function generateConfigs(
     string $outputFormat,
     array $versions,
 ): array {
-    $template = file_get_contents(__DIR__ . '/' . $directory . '/' . $templateFile);
-    $header = '# This file is generated automatically - please edit the corresponding template file!';
+    $templateRelativePath = 'templates/' . $directory . '/' . $templateFile;
+    $template = file_get_contents(__DIR__ . '/' . $templateRelativePath);
+    $header = sprintf(
+        '# This file is generated automatically - please edit the "%s" template file instead.',
+        $templateRelativePath
+    );
 
     $files = [];
 
     foreach ($versions as $version) {
-        $filename = sprintf('/%s/' . $outputFormat . '.yml', $directory, $version);
+        $filename = sprintf('/generated/%s/' . $outputFormat . '.yml', $directory, $version);
         $files[] = '.evergreen/config' . $filename;
 
         $replacements = ['%' . $replacementName . '%' => $version];

.evergreen/config/build/build-libmongoc-8.2.yml renamed to .evergreen/config/generated/build/build-libmongoc-8.2.yml

@@ -1,5 +1 @@
-.evergreen/config/build/*.yml linguist-generated=true
-.evergreen/config/build/_template*.yml linguist-generated=false
-
-.evergreen/config/test/*.yml linguist-generated=true
-.evergreen/config/test/_template*.yml linguist-generated=false
+.evergreen/config/generated/** linguist-generated=true