Update CI build scripts

maksimkurb · Nov 11, 2024 · 34a1104 · 34a1104
1 parent 0f80e41
commit 34a1104
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 176 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -107,7 +107,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: 'main'
+          ref: 'entware'
 
       - name: Prepare build
         env:
@@ -120,11 +120,11 @@ jobs:
       - name: Build packages
         id: build
         run: |
-          echo "src-link keeneticPbr /keeneticPbr" | docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keeneticPbr -w /home/me/Entware --name builder builder tee -a feeds.conf
-          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keeneticPbr -w /home/me/Entware --name builder builder ./scripts/feeds update keeneticPbr
-          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keeneticPbr -w /home/me/Entware --name builder builder ./scripts/feeds install -a -p keeneticPbr
-          echo "CONFIG_PACKAGE_keenetic-pbr=m" | docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keeneticPbr -w /home/me/Entware --name builder builder tee -a .config
-          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keeneticPbr -w /home/me/Entware --name builder builder make package/keenetic-pbr/compile V=s
+          echo "src-link keeneticPbr /keenetic-pbr" | docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keenetic-pbr -w /home/me/Entware --name builder builder tee -a feeds.conf
+          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keenetic-pbr -w /home/me/Entware --name builder builder ./scripts/feeds update keeneticPbr
+          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keenetic-pbr -w /home/me/Entware --name builder builder ./scripts/feeds install -a -p keeneticPbr
+          echo "CONFIG_PACKAGE_keenetic-pbr=m" | docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keenetic-pbr -w /home/me/Entware --name builder builder tee -a .config
+          docker run --rm -i --mount source=entware-home,target=/home/me -v $GITHUB_WORKSPACE:/keenetic-pbr -w /home/me/Entware --name builder builder make package/keenetic-pbr/compile V=s
 
       - name: Extract packages
         if: steps.build.outcome == 'success'

diff --git a/Makefile b/Makefile
diff --git a/opt/etc/keenetic-pbr/keenetic-pbr.conf → keenetic-pbr.example.conf b/opt/etc/keenetic-pbr/keenetic-pbr.conf → keenetic-pbr.example.conf
diff --git a/opt/etc/cron.daily/50-keenetic-pbr-lists-update.sh b/opt/etc/cron.daily/50-keenetic-pbr-lists-update.sh
diff --git a/opt/etc/ndm/fs.d/50-keenetic-pbr-disable-hwnat.sh b/opt/etc/ndm/fs.d/50-keenetic-pbr-disable-hwnat.sh
diff --git a/opt/etc/ndm/ifstatechanged.d/50-keenetic-pbr-routing.sh b/opt/etc/ndm/ifstatechanged.d/50-keenetic-pbr-routing.sh
diff --git a/opt/etc/ndm/netfilter.d/50-keenetic-pbr-fwmarks.sh b/opt/etc/ndm/netfilter.d/50-keenetic-pbr-fwmarks.sh