[openwrt/openwrt] CI: build: fix parse toolchain step failing for git strict rules

LEDE Commits lede-commits at lists.infradead.org
Thu May 25 14:50:46 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/ec6bbc52557e559a469761d182d690af20bf6189

commit ec6bbc52557e559a469761d182d690af20bf6189
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu May 25 02:44:21 2023 +0200

    CI: build: fix parse toolchain step failing for git strict rules
    
    Commit 1cb8cdb ("ci: use new buildbot worker images with Debian 11")
    introduced new Git version with strict rules for owner of the git
    directory.
    
    To handle this and not cause major change, just move the parsing before
    the change of ownership of the openwrt directory permitting the correct
    run of git fetch command with the same user that did the repository
    checkout.
    
    Fixes: 1cb8cdb ("ci: use new buildbot worker images with Debian 11")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
    (cherry picked from commit 0063e71d66766818fba286efe2a0ed8746c265e5)
---
 .github/workflows/build.yml | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52fba8e106..816ef6ab3c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -156,28 +156,6 @@ jobs:
           repository: openwrt/telephony
           path: openwrt/feeds/telephony
 
-      - name: Fix permission
-        run: |
-          chown -R buildbot:buildbot openwrt
-
-      - name: Prepare prebuilt tools
-        shell: su buildbot -c "sh -e {0}"
-        working-directory: openwrt
-        run: |
-          mkdir -p staging_dir build_dir
-          ln -s /prebuilt_tools/staging_dir/host staging_dir/host
-          ln -s /prebuilt_tools/build_dir/host build_dir/host
-
-          ./scripts/ext-tools.sh --refresh
-
-      - name: Update & Install feeds
-        if: inputs.include_feeds == true
-        shell: su buildbot -c "sh -e {0}"
-        working-directory: openwrt
-        run: |
-          ./scripts/feeds update -a
-          ./scripts/feeds install -a
-
       - name: Parse toolchain file
         if: inputs.build_toolchain == false
         id: parse-toolchain
@@ -227,6 +205,28 @@ jobs:
           echo "TOOLCHAIN_FILE=$TOOLCHAIN_FILE" >> "$GITHUB_ENV"
           echo "TOOLCHAIN_PATH=$TOOLCHAIN_PATH" >> "$GITHUB_ENV"
 
+      - name: Fix permission
+        run: |
+          chown -R buildbot:buildbot openwrt
+
+      - name: Prepare prebuilt tools
+        shell: su buildbot -c "sh -e {0}"
+        working-directory: openwrt
+        run: |
+          mkdir -p staging_dir build_dir
+          ln -s /prebuilt_tools/staging_dir/host staging_dir/host
+          ln -s /prebuilt_tools/build_dir/host build_dir/host
+
+          ./scripts/ext-tools.sh --refresh
+
+      - name: Update & Install feeds
+        if: inputs.include_feeds == true
+        shell: su buildbot -c "sh -e {0}"
+        working-directory: openwrt
+        run: |
+          ./scripts/feeds update -a
+          ./scripts/feeds install -a
+
       - name: Cache ccache
         uses: actions/cache at v3
         with:




More information about the lede-commits mailing list