From 468c2d8d1dd1d751508783b6a55a08e739efce75 Mon Sep 17 00:00:00 2001
From: Yang Sun <sunytt@google.com>
Date: Wed, 10 Apr 2024 03:58:52 -0700
Subject: [PATCH] Build for 1.3.1 in CI

Added DOCKER=1 for otbr bootstrap to skip installing resolvconf
---
 .github/workflows/build.yml | 10 ++++++++--
 script/make-firmware.bash   |  5 ++++-
 script/make-raspbian.bash   |  2 +-
 script/otbr-setup.bash      |  3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 75cd785..e41ab1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,12 +53,18 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           submodules: recursive
-      - name: Build reference release for 1.2
+      - name: Build nrf52840 reference release for 1.2
         run: |
           REFERENCE_PLATFORM=nrf52840 REFERENCE_RELEASE_TYPE=1.2  ./script/make-reference-release.bash
-      - name: Build reference release for 1.3
+      - name: Build nrf52840 reference release for 1.3
         run: |
           REFERENCE_PLATFORM=nrf52840 REFERENCE_RELEASE_TYPE=1.3  ./script/make-reference-release.bash
+      - name: Build ncs reference release for 1.3.1
+        run: |
+          git submodule status
+          export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
+          export GNUARMEMB_TOOLCHAIN_PATH=/tmp/gcc-arm-none-eabi-9-2019-q4-major/
+          REFERENCE_PLATFORM=ncs REFERENCE_RELEASE_TYPE=1.3.1 ./script/make-reference-release.bash
       - uses: actions/upload-artifact@v3
         with:
           name: reference-releases
diff --git a/script/make-firmware.bash b/script/make-firmware.bash
index 5f02787..105bb1c 100755
--- a/script/make-firmware.bash
+++ b/script/make-firmware.bash
@@ -180,7 +180,7 @@ build_ot()
             git clean -xfd
 
             # Use OpenThread from top-level of repo
-            rm -rf openthread
+            mv openthread openthread-backup
             ln -s ../openthread .
 
             # Build
@@ -203,6 +203,9 @@ build_ot()
 
             # Clean up
             git clean -xfd
+            # Move back openthread as symbolic link is not accepted by git_archive_all
+            rm openthread
+            mv openthread-backup openthread
             ;;
         "1.1")
             # Build OpenThread 1.1
diff --git a/script/make-raspbian.bash b/script/make-raspbian.bash
index 575de69..6370c93 100755
--- a/script/make-raspbian.bash
+++ b/script/make-raspbian.bash
@@ -126,7 +126,7 @@ main()
 
     # Mount /etc/resolv.conf
     if [ -f "/etc/resolv.conf" ]; then
-        sudo mount -o ro,bind /etc/resolv.conf "$QEMU_ROOT"/etc/resolv.conf
+        sudo mount -o rw,bind /etc/resolv.conf "$QEMU_ROOT"/etc/resolv.conf
     fi
 
     # Start RPi QEMU machine
diff --git a/script/otbr-setup.bash b/script/otbr-setup.bash
index 7b08314..c03c050 100755
--- a/script/otbr-setup.bash
+++ b/script/otbr-setup.bash
@@ -82,6 +82,7 @@ readonly OTBR_THREAD_1_3_1_OPTIONS=(
     "-DOT_THREAD_VERSION=1.3.1"
     "-DOTBR_TREL=ON"
     "-DOTBR_NAT64=ON"
+    "-DOT_BORDER_ROUTING_DHCP6_PD=ON"
 )
 
 build_options=(
@@ -175,7 +176,7 @@ chown -R pi:pi /home/pi/repo
 cd /home/pi/repo/ot-br-posix
 apt-get update
 apt-get install -y --no-install-recommends git python3-pip
-su -c "${build_options[*]} script/bootstrap" pi
+su -c "export DOCKER=1; ${build_options[*]} script/bootstrap" pi
 
 rm -rf /home/pi/repo/ot-br-posix/third_party/openthread/repo
 cp -r /home/pi/repo/openthread /home/pi/repo/ot-br-posix/third_party/openthread/repo