From 1c99ad47b19c1f39f7459b099ab6fb1269cee483 Mon Sep 17 00:00:00 2001
From: Piotr Solnica <piotr.solnica@gmail.com>
Date: Thu, 9 Jan 2020 12:27:39 +0100
Subject: [PATCH] Update sync_configs.yml

---
 .github/workflows/sync_configs.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sync_configs.yml b/.github/workflows/sync_configs.yml
index 58b93a61..7d2c333b 100644
--- a/.github/workflows/sync_configs.yml
+++ b/.github/workflows/sync_configs.yml
@@ -9,6 +9,9 @@ jobs:
   sync-configs:
     runs-on: ubuntu-latest
     if: github.event.action == 'sync_configs'
+    env:
+      GITHUB_LOGIN: dry-bot
+      GITHUB_TOKEN: ${{ secrets.GH_PAT }}
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby
@@ -26,16 +29,21 @@ jobs:
       - name: Clone devtools
         run: git clone https://github.com/dry-rb/devtools.git tmp/devtools
       - name: Compile file templates
-        env:
-          GITHUB_LOGIN: dry-bot
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         run: |
           if [ -f "project.yml" ]; then
             for t in `ls tmp/devtools/templates`
             do
-              bin/ossy t c $t $(echo $t | sed -e 's/^tmp\/devtools\/templates\///g' | sed -e 's/\.erb$//g') project.yml
+              bin/ossy t c tmp/devtools/templates/$t $(basename $t .erb) project.yml
             done
           fi
+      - name: Merge configuration files from devtools
+        run: |
+          for f in `ls tmp/devtools/workflows/*.yml`
+          do
+            n="$(basename $f)";
+            c=".github/workflows/custom/$n";
+            [ -f $c ] && bin/ossy c m $f $c .github/workflows/$n || echo "no custom config found for $f"
+          done
       - name: Update configuration files from devtools
         run: |
           if [ -f ".github/workflows/custom_ci.yml" ]; then