mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-03-14 06:22:46 +03:00
build: Rename base directories
This commit is contained in:
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -205,7 +205,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
|
PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
|
||||||
MKFN=$PKGDIR/luci-app-zapret/Makefile
|
MKFN=$PKGDIR/luci-app-zapret2/Makefile
|
||||||
PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
|
PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
|
||||||
PKGREL=$( grep -s '^PKG_RELEASE:=.*' $MKFN | cut -d'=' -f2 )
|
PKGREL=$( grep -s '^PKG_RELEASE:=.*' $MKFN | cut -d'=' -f2 )
|
||||||
[ "$PKGREL" != "1" ] && PKGVER=$PKGVER-r$PKGREL
|
[ "$PKGREL" != "1" ] && PKGVER=$PKGVER-r$PKGREL
|
||||||
@@ -249,9 +249,9 @@ jobs:
|
|||||||
cat .config
|
cat .config
|
||||||
echo "------------- .config END -------------------"
|
echo "------------- .config END -------------------"
|
||||||
if [ "$ARCH" = "$LUCI_ARCH" ]; then
|
if [ "$ARCH" = "$LUCI_ARCH" ]; then
|
||||||
PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
|
PKGLIST=`echo package/zapret-openwrt/{zapret2,zapret2-mdig,zapret2-ip2net,luci-app-zapret2}/compile`
|
||||||
else
|
else
|
||||||
PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-mdig,zapret-ip2net}/compile`
|
PKGLIST=`echo package/zapret-openwrt/{zapret2,zapret2-mdig,zapret2-ip2net}/compile`
|
||||||
fi
|
fi
|
||||||
if [ "$MAX_SPEED" = "false" ]; then
|
if [ "$MAX_SPEED" = "false" ]; then
|
||||||
make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
|
make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
|
||||||
|
|||||||
Reference in New Issue
Block a user