yaml => yml

spockframework · Apr 17, 2023 · b8fd23e · b8fd23e
1 parent bdfc6fb
commit b8fd23e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/branches-and-prs.main.kts b/.github/workflows/branches-and-prs.main.kts
@@ -47,6 +47,7 @@ workflow(
         )
     ),
     sourceFile = __FILE__.toPath(),
+    targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml",
     // https://stackoverflow.com/a/72408109/16358266
     concurrency = Concurrency(
         group = "${expr { github.workflow }}-${expr("${Contexts.github.eventPullRequest.pull_request.number} || ${Contexts.github.ref}")}",

diff --git a/.github/workflows/branches-and-prs.yaml → .github/workflows/branches-and-prs.yml b/.github/workflows/branches-and-prs.yaml → .github/workflows/branches-and-prs.yml
@@ -24,10 +24,10 @@ jobs:
       uses: actions/checkout@v3
     - id: step-1
       name: Execute script
-      run: rm '.github/workflows/branches-and-prs.yaml' && '.github/workflows/branches-and-prs.main.kts'
+      run: rm '.github/workflows/branches-and-prs.yml' && '.github/workflows/branches-and-prs.main.kts'
     - id: step-2
       name: Consistency check
-      run: git diff --exit-code '.github/workflows/branches-and-prs.yaml'
+      run: git diff --exit-code '.github/workflows/branches-and-prs.yml'
   check_all_workflow_yaml_consistency:
     name: Check all Workflow YAML consistency
     runs-on: ubuntu-latest

diff --git a/.github/workflows/codeql-analysis.main.kts b/.github/workflows/codeql-analysis.main.kts
@@ -53,6 +53,7 @@ workflow(
         )
     ),
     sourceFile = __FILE__.toPath(),
+    targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml",
     // https://stackoverflow.com/a/72408109/16358266
     concurrency = Concurrency(
         group = "${expr { github.workflow }}-${expr("${github.eventPullRequest.pull_request.number} || ${github.ref}")}",

diff --git a/.github/workflows/codeql-analysis.yaml → .github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yaml → .github/workflows/codeql-analysis.yml
@@ -23,10 +23,10 @@ jobs:
       uses: actions/checkout@v3
     - id: step-1
       name: Execute script
-      run: rm '.github/workflows/codeql-analysis.yaml' && '.github/workflows/codeql-analysis.main.kts'
+      run: rm '.github/workflows/codeql-analysis.yml' && '.github/workflows/codeql-analysis.main.kts'
     - id: step-2
       name: Consistency check
-      run: git diff --exit-code '.github/workflows/codeql-analysis.yaml'
+      run: git diff --exit-code '.github/workflows/codeql-analysis.yml'
   codeql-build:
     name: CodeQL-Build
     runs-on: ubuntu-latest

diff --git a/.github/workflows/gradle-wrapper-validation.main.kts b/.github/workflows/gradle-wrapper-validation.main.kts
@@ -32,7 +32,8 @@ workflow(
         Push(),
         PullRequest()
     ),
-    sourceFile = __FILE__.toPath()
+    sourceFile = __FILE__.toPath(),
+    targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml"
 ) {
     job(
         id = "validation",

diff --git a/.../workflows/gradle-wrapper-validation.yaml → ...b/workflows/gradle-wrapper-validation.yml b/.../workflows/gradle-wrapper-validation.yaml → ...b/workflows/gradle-wrapper-validation.yml
@@ -16,10 +16,10 @@ jobs:
       uses: actions/checkout@v3
     - id: step-1
       name: Execute script
-      run: rm '.github/workflows/gradle-wrapper-validation.yaml' && '.github/workflows/gradle-wrapper-validation.main.kts'
+      run: rm '.github/workflows/gradle-wrapper-validation.yml' && '.github/workflows/gradle-wrapper-validation.main.kts'
     - id: step-2
       name: Consistency check
-      run: git diff --exit-code '.github/workflows/gradle-wrapper-validation.yaml'
+      run: git diff --exit-code '.github/workflows/gradle-wrapper-validation.yml'
   validation:
     name: Validation
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.main.kts b/.github/workflows/release.main.kts
@@ -40,7 +40,8 @@ workflow(
             tags = listOf("spock-*")
         )
     ),
-    sourceFile = __FILE__.toPath()
+    sourceFile = __FILE__.toPath(),
+    targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml"
 ) {
     val GITHUB_TOKEN by Contexts.secrets
     val SONATYPE_OSS_USER by Contexts.secrets

diff --git a/.github/workflows/release.yaml → .github/workflows/release.yml b/.github/workflows/release.yaml → .github/workflows/release.yml
@@ -19,10 +19,10 @@ jobs:
       uses: actions/checkout@v3
     - id: step-1
       name: Execute script
-      run: rm '.github/workflows/release.yaml' && '.github/workflows/release.main.kts'
+      run: rm '.github/workflows/release.yml' && '.github/workflows/release.main.kts'
     - id: step-2
       name: Consistency check
-      run: git diff --exit-code '.github/workflows/release.yaml'
+      run: git diff --exit-code '.github/workflows/release.yml'
   build-and-verify:
     name: Build and Verify
     runs-on: ${{ matrix.os }}

diff --git a/...cess-workflows/src/main/groovy/org/spockframework/gradle/PreprocessWorkflowsPlugin.groovy b/...cess-workflows/src/main/groovy/org/spockframework/gradle/PreprocessWorkflowsPlugin.groovy
@@ -48,7 +48,7 @@ class PreprocessWorkflowsPlugin implements Plugin<Project> {
           .file(workflowScript)
           .withPropertyName('workflowScript')
         it.outputs
-          .file(new File(workflowScript.parent, "${workflowName}.yaml"))
+          .file(new File(workflowScript.parent, "${workflowName}.yml"))
           .withPropertyName('workflowFile')
 
         it.javaLauncher.set project.extensions.getByType(JavaToolchainService).launcherFor {