chore: mergify fixing continued (#54)

winglang · Jan 4, 2024 · 3a6ec62 · 3a6ec62
1 parent 692e5ae
commit 3a6ec62
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 63 deletions.
diff --git a/.github/workflows/bedrock-pull.yaml b/.github/workflows/bedrock-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - bedrock/**
 jobs:
-  build:
+  build-bedrock:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/bedrock-release.yaml b/.github/workflows/bedrock-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - bedrock/**
 jobs:
-  build:
+  build-bedrock:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/checks-pull.yaml b/.github/workflows/checks-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - checks/**
 jobs:
-  build:
+  build-checks:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/checks-release.yaml b/.github/workflows/checks-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - checks/**
 jobs:
-  build:
+  build-checks:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/containers-pull.yaml b/.github/workflows/containers-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - containers/**
 jobs:
-  build:
+  build-containers:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/containers-release.yaml b/.github/workflows/containers-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - containers/**
 jobs:
-  build:
+  build-containers:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/fifoqueue-pull.yaml b/.github/workflows/fifoqueue-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - fifoqueue/**
 jobs:
-  build:
+  build-fifoqueue:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/fifoqueue-release.yaml b/.github/workflows/fifoqueue-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - fifoqueue/**
 jobs:
-  build:
+  build-fifoqueue:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/github-pull.yaml b/.github/workflows/github-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - github/**
 jobs:
-  build:
+  build-github:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/github-release.yaml b/.github/workflows/github-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - github/**
 jobs:
-  build:
+  build-github:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/postgres-pull.yaml b/.github/workflows/postgres-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - postgres/**
 jobs:
-  build:
+  build-postgres:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/postgres-release.yaml b/.github/workflows/postgres-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - postgres/**
 jobs:
-  build:
+  build-postgres:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/redis-pull.yaml b/.github/workflows/redis-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - redis/**
 jobs:
-  build:
+  build-redis:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/redis-release.yaml b/.github/workflows/redis-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - redis/**
 jobs:
-  build:
+  build-redis:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/websockets-pull.yaml b/.github/workflows/websockets-pull.yaml
@@ -4,7 +4,7 @@ on:
     paths:
       - websockets/**
 jobs:
-  build:
+  build-websockets:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/websockets-release.yaml b/.github/workflows/websockets-release.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - websockets/**
 jobs:
-  build:
+  build-websockets:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.mergify.yml b/.mergify.yml
@@ -33,29 +33,29 @@ pull_request_rules:
       - base=main
       - check-success=Validate PR title
       - or:
-          - check-success=bedrock-pull / build
-          - check-skipped=bedrock-pull / build
+          - check-success=build-bedrock
+          - check-skipped=build-bedrock
       - or:
-          - check-success=checks-pull / build
-          - check-skipped=checks-pull / build
+          - check-success=build-checks
+          - check-skipped=build-checks
       - or:
-          - check-success=containers-pull / build
-          - check-skipped=containers-pull / build
+          - check-success=build-containers
+          - check-skipped=build-containers
       - or:
-          - check-success=fifoqueue-pull / build
-          - check-skipped=fifoqueue-pull / build
+          - check-success=build-fifoqueue
+          - check-skipped=build-fifoqueue
       - or:
-          - check-success=github-pull / build
-          - check-skipped=github-pull / build
+          - check-success=build-github
+          - check-skipped=build-github
       - or:
-          - check-success=postgres-pull / build
-          - check-skipped=postgres-pull / build
+          - check-success=build-postgres
+          - check-skipped=build-postgres
       - or:
-          - check-success=redis-pull / build
-          - check-skipped=redis-pull / build
+          - check-success=build-redis
+          - check-skipped=build-redis
       - or:
-          - check-success=websockets-pull / build
-          - check-skipped=websockets-pull / build
+          - check-success=build-websockets
+          - check-skipped=build-websockets
   - name: requires manual merge
     conditions:
       - files=.mergify.yml
@@ -71,29 +71,29 @@ pull_request_rules:
       - base=main
       - check-success=Validate PR title
       - or:
-          - check-success=bedrock-pull / build
-          - check-skipped=bedrock-pull / build
+          - check-success=build-bedrock
+          - check-skipped=build-bedrock
       - or:
-          - check-success=checks-pull / build
-          - check-skipped=checks-pull / build
+          - check-success=build-checks
+          - check-skipped=build-checks
       - or:
-          - check-success=containers-pull / build
-          - check-skipped=containers-pull / build
+          - check-success=build-containers
+          - check-skipped=build-containers
       - or:
-          - check-success=fifoqueue-pull / build
-          - check-skipped=fifoqueue-pull / build
+          - check-success=build-fifoqueue
+          - check-skipped=build-fifoqueue
       - or:
-          - check-success=github-pull / build
-          - check-skipped=github-pull / build
+          - check-success=build-github
+          - check-skipped=build-github
       - or:
-          - check-success=postgres-pull / build
-          - check-skipped=postgres-pull / build
+          - check-success=build-postgres
+          - check-skipped=build-postgres
       - or:
-          - check-success=redis-pull / build
-          - check-skipped=redis-pull / build
+          - check-success=build-redis
+          - check-skipped=build-redis
       - or:
-          - check-success=websockets-pull / build
-          - check-skipped=websockets-pull / build
+          - check-success=build-websockets
+          - check-skipped=build-websockets
     actions:
       comment:
         message: Thank you for contributing! Your pull request contains mergify

diff --git a/library.w b/library.w
@@ -103,6 +103,11 @@ pub class Library {
       },
     });
 
+    let releaseJobs = MutJson {};
+    releaseJobs.set("build-{base}", {
+      "runs-on": "ubuntu-latest",
+      steps: releaseSteps.copy(),
+    });
     fs.writeYaml("{workflowdir}/{base}-release.yaml", { 
       name: "{base}-release",
       on: {
@@ -111,27 +116,22 @@ pub class Library {
           paths: ["{libdir}/**"]
         }
       },
-      jobs: {
-        build: {
-          "runs-on": "ubuntu-latest",
-          steps: releaseSteps.copy()
-        }
-      }
+      jobs: Json.deepCopy(releaseJobs),
     });
 
-    fs.writeYaml("{workflowdir}/{base}-pull.yaml", { 
+    let pullJobs = MutJson {};
+    pullJobs.set("build-{base}", {
+      "runs-on": "ubuntu-latest",
+      steps: pullSteps.copy(),
+    });
+    fs.writeYaml("{workflowdir}/{base}-pull.yaml", {
       name: "{base}-pull",
       on: {
         pull_request: {
           paths: ["{libdir}/**"]
         }
       },
-      jobs: {
-        build: {
-          "runs-on": "ubuntu-latest",
-          steps: pullSteps.copy()
-        }
-      }
+      jobs: Json.deepCopy(pullJobs),
     });
   }
 }
diff --git a/mergify.w b/mergify.w
@@ -7,8 +7,8 @@ pub class MergifyWorkflow {
     for lib in libs {
       buildChecks.push(Json {
         "or": [
-          "check-success={lib}-pull / build",
-          "check-skipped={lib}-pull / build",
+          "check-success=build-{lib}",
+          "check-skipped=build-{lib}",
         ]
       });
     }