Update merge-linux.yml

.github/workflows/merge-linux.yml

@@ -10,46 +10,53 @@ permissions:
   contents: write
 
 jobs:
-  linux-5_10:
+  setup:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
     - name: Set id
       run: |
         git config --global user.name "GitHub Actions"
         git config --global user.email "[email protected]"
 
-    - name: Merge Linux 5.10
+  linux-5_10:
+    runs-on: ubuntu-latest
+    env:
+      KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
+      KERNEL_VERSION: linux-5.10.214
+      KERNEL_BRANCH: linux-5.10
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Merge ${{env.KERNEL_BRANCH}}
       continue-on-error: true
-      run: ./init.sh -u https://cdn.kernel.org/pub/linux/kernel/v5.x/ -v linux-5.10.214 -b linux-5.10
+      run: ./init.sh -u  ${{env.KERNEL_URL}} -v  ${{env.KERNEL_VERSION}} -b  ${{env.KERNEL_BRANCH}}
 
-    - name: Push changes Linux 5.10
+    - name: Push changes ${{env.KERNEL_BRANCH}}
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.SY_PAT }}
-        branch: linux-5.10
-        directory: kernel/dst/linux-5.15/linux-5.10
+        branch: ${{env.KERNEL_BRANCH}}
+        directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
         force: true
 
   linux-5_15:
     runs-on: ubuntu-latest
+    env:
+      KERNEL_URL: https://cdn.kernel.org/pub/linux/kernel/v5.x/
+      KERNEL_VERSION: linux-5.15.154
+      KERNEL_BRANCH: linux-5.15
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set id
-      run: |
-        git config --global user.name "GitHub Actions"
-        git config --global user.email "[email protected]"
-    
-    - name: Merge Linux 5.15
+    - name: Merge ${{env.KERNEL_BRANCH}}
       continue-on-error: true
-      run: ./init.sh -u https://cdn.kernel.org/pub/linux/kernel/v5.x/ -v linux-5.15.154 -b linux-5.15
+      run: ./init.sh -u  ${{env.KERNEL_URL}} -v  ${{env.KERNEL_VERSION}} -b  ${{env.KERNEL_BRANCH}}
 
-    - name: Push changes Linux 5.15
+    - name: Push changes ${{env.KERNEL_BRANCH}}
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.SY_PAT }}
-        branch: linux-5.15
-        directory: kernel/dst/linux-5.15/linux-5.15
+        branch: ${{env.KERNEL_BRANCH}}
+        directory: kernel/dst/${{env.KERNEL_BRANCH}}/${{env.KERNEL_BRANCH}}
         force: true