From d08f06ac7d13da95d311497d0c4486e66b721016 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 5 Aug 2024 05:44:12 +0000
Subject: GitHub: T6560: checkout pull request HEAD commit instead of merge
 commit

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

diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index 0a8208b87..467ff062e 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -37,6 +37,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: packages/vyos-1x
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Build vyos-1x package
         run: |
           cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b
-- 
cgit v1.2.3


From 6e910723ed9bd7f510f39379298bd98375608bfa Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 5 Aug 2024 05:44:29 +0000
Subject: firewall: T4694: fix GRE key include path in XML

---
 interface-definitions/include/firewall/gre.xml.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface-definitions/include/firewall/gre.xml.i b/interface-definitions/include/firewall/gre.xml.i
index 285233434..e7b9fd5b1 100644
--- a/interface-definitions/include/firewall/gre.xml.i
+++ b/interface-definitions/include/firewall/gre.xml.i
@@ -33,7 +33,7 @@
                 <valueless/>
               </properties>
             </leafNode>
-          </children>            
+          </children>
         </node>
         <node name="sequence">
           <properties>
@@ -94,7 +94,7 @@
         </constraint>
       </properties>
     </leafNode>
-    #include <interface/parameters-key.xml.i>
+    #include <include/interface/parameters-key.xml.i>
     <leafNode name="version">
       <properties>
         <help>GRE Version</help>
-- 
cgit v1.2.3


From 2fd817e51532c6428c95704233e62585e76b2ad8 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 5 Aug 2024 05:45:00 +0000
Subject: smoketest: T6555: openvpn: SyntaxError: '(' was never closed

---
 smoketest/scripts/cli/test_interfaces_openvpn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py
index 5584501c5..f23a28c25 100755
--- a/smoketest/scripts/cli/test_interfaces_openvpn.py
+++ b/smoketest/scripts/cli/test_interfaces_openvpn.py
@@ -678,7 +678,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'dh /run/openvpn/{vtun_if}_dh.pem', config)
 
         # check that no interface remained after deleting them
-        self.cli_delete((['interfaces', 'bridge', br_if, 'member', 'interface', vtun_if])
+        self.cli_delete(['interfaces', 'bridge', br_if, 'member', 'interface', vtun_if])
         self.cli_delete(base_path)
         self.cli_commit()
 
-- 
cgit v1.2.3