From 71f9e3fad617231247f2ea0cefab5e1d490bfd8d Mon Sep 17 00:00:00 2001
From: "Oleg V. Kozlyuk" <elquentaro@gmail.com>
Date: Thu, 29 Aug 2024 23:03:47 +0200
Subject: [PATCH 1/5] Create update-linux workflow

---
 .github/workflows/update-linux.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/update-linux.yml

diff --git a/.github/workflows/update-linux.yml b/.github/workflows/update-linux.yml
new file mode 100644
index 000000000..9f7aaecae
--- /dev/null
+++ b/.github/workflows/update-linux.yml
@@ -0,0 +1,24 @@
+name: Update Linux branch
+on:
+  workflow_dispatch:
+  push:
+    branches: ["main"]
+
+permissions:
+  contents: write
+
+jobs:
+  update:
+    name: Update 'linux' branch
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: linux
+      - name: Update branch
+        run: |
+          git checkout linux
+          git merge main --no-edit -m "Merged main branch on $(date +%F)"
+          git push origin X
+  

From 92f7873835f2354cf3c34a1ae5d0c55536118ab1 Mon Sep 17 00:00:00 2001
From: "Oleg V. Kozlyuk" <elquentaro@gmail.com>
Date: Thu, 29 Aug 2024 23:06:53 +0200
Subject: [PATCH 2/5] Update update-linux.yml

---
 .github/workflows/update-linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-linux.yml b/.github/workflows/update-linux.yml
index 9f7aaecae..c95f8d97c 100644
--- a/.github/workflows/update-linux.yml
+++ b/.github/workflows/update-linux.yml
@@ -19,6 +19,6 @@ jobs:
       - name: Update branch
         run: |
           git checkout linux
-          git merge main --no-edit -m "Merged main branch on $(date +%F)"
-          git push origin X
+          git merge origin/main --no-edit -m "Merged main branch on $(date +%F)"
+          git push origin linux
   

From df533969379f4d857004ef9faf9914dbf0d3499e Mon Sep 17 00:00:00 2001
From: "Oleg V. Kozlyuk" <elquentaro@gmail.com>
Date: Thu, 29 Aug 2024 23:07:55 +0200
Subject: [PATCH 3/5] Create on-push-linux.yml

---
 .github/workflows/on-push-linux.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/on-push-linux.yml

diff --git a/.github/workflows/on-push-linux.yml b/.github/workflows/on-push-linux.yml
new file mode 100644
index 000000000..ffcfeb528
--- /dev/null
+++ b/.github/workflows/on-push-linux.yml
@@ -0,0 +1,24 @@
+name: On Push
+
+on:  
+  push:
+    branches:
+      - linux
+    paths-ignore: [ 'Doc/**', 'Flights/**', 'Html/**', 'Images/**', 'Localdoc/**', 'Scenarios/**', 'Textures/**', 'Textures2/**']
+  pull_request:
+    branches:
+      - linux
+    paths-ignore: [ 'Doc/**', 'Flights/**', 'Html/**', 'Images/**', 'Localdoc/**', 'Scenarios/**', 'Textures/**', 'Textures2/**']
+
+jobs:
+  build:
+    name: Push
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [x64]
+        os: [ubuntu-latest]
+    uses: ./.github/workflows/reusable-build.yml
+    with:
+      os: ${{ matrix.os }}
+      architecture: ${{ matrix.architecture }}

From 6aedc5909ae23ee42e026d9904b61ab133e50d00 Mon Sep 17 00:00:00 2001
From: "Oleg V. Kozlyuk" <elquentaro@gmail.com>
Date: Thu, 29 Aug 2024 23:08:53 +0200
Subject: [PATCH 4/5] Update on-push-linux.yml

---
 .github/workflows/on-push-linux.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/on-push-linux.yml b/.github/workflows/on-push-linux.yml
index ffcfeb528..6552258bb 100644
--- a/.github/workflows/on-push-linux.yml
+++ b/.github/workflows/on-push-linux.yml
@@ -1,6 +1,7 @@
-name: On Push
+name: Linux
 
-on:  
+on:
+  workflow_dispatch:
   push:
     branches:
       - linux

From bae1a70f6569dc2749875f95ddb825ff29963040 Mon Sep 17 00:00:00 2001
From: "Oleg V. Kozlyuk" <elquentaro@gmail.com>
Date: Thu, 29 Aug 2024 23:11:21 +0200
Subject: [PATCH 5/5] Update update-linux.yml

---
 .github/workflows/update-linux.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/update-linux.yml b/.github/workflows/update-linux.yml
index c95f8d97c..59f4f35d3 100644
--- a/.github/workflows/update-linux.yml
+++ b/.github/workflows/update-linux.yml
@@ -18,6 +18,8 @@ jobs:
           ref: linux
       - name: Update branch
         run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
           git checkout linux
           git merge origin/main --no-edit -m "Merged main branch on $(date +%F)"
           git push origin linux