Mwftts patch 1

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
     - cron:  '0 0 * * 0'
 jobs:
   create-release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       upload_url: ${{ steps.create-release.outputs.upload_url }}
       id: ${{ steps.create-release.outputs.id }}
@@ -24,94 +24,23 @@ jobs:
       matrix:
         beta: [false]
         download-url:
-          - https://downloads.openwrt.org/releases/19.07.4/targets/pistachio/generic/openwrt-sdk-19.07.4-pistachio_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/oxnas/ox820/openwrt-sdk-19.07.4-oxnas-ox820_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/rt3883/openwrt-sdk-19.07.4-ramips-rt3883_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/rt288x/openwrt-sdk-19.07.4-ramips-rt288x_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/octeontx/generic/openwrt-sdk-19.07.4-octeontx_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/rb532/generic/openwrt-sdk-19.07.4-rb532_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/mt76x8/openwrt-sdk-19.07.4-ramips-mt76x8_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/rt305x/openwrt-sdk-19.07.4-ramips-rt305x_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/mt7621/openwrt-sdk-19.07.4-ramips-mt7621_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ramips/mt7620/openwrt-sdk-19.07.4-ramips-mt7620_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mediatek/mt7623/openwrt-sdk-19.07.4-mediatek-mt7623_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mediatek/mt7622/openwrt-sdk-19.07.4-mediatek-mt7622_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ipq806x/generic/openwrt-sdk-19.07.4-ipq806x-generic_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/lantiq/xway_legacy/openwrt-sdk-19.07.4-lantiq-xway_legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/lantiq/xway/openwrt-sdk-19.07.4-lantiq-xway_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/lantiq/xrx200/openwrt-sdk-19.07.4-lantiq-xrx200_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/lantiq/falcon/openwrt-sdk-19.07.4-lantiq-falcon_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/lantiq/ase/openwrt-sdk-19.07.4-lantiq-ase_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/kirkwood/generic/openwrt-sdk-19.07.4-kirkwood_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/omap/generic/openwrt-sdk-19.07.4-omap_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/layerscape/armv7/openwrt-sdk-19.07.4-layerscape-armv7_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/layerscape/armv8_64b/openwrt-sdk-19.07.4-layerscape-armv8_64b_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/malta/be/openwrt-sdk-19.07.4-malta-be_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mvebu/cortexa9/openwrt-sdk-19.07.4-mvebu-cortexa9_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mvebu/cortexa72/openwrt-sdk-19.07.4-mvebu-cortexa72_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/zynq/generic/openwrt-sdk-19.07.4-zynq_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/sunxi/cortexa8/openwrt-sdk-19.07.4-sunxi-cortexa8_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/tegra/generic/openwrt-sdk-19.07.4-tegra_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/sunxi/cortexa7/openwrt-sdk-19.07.4-sunxi-cortexa7_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/sunxi/cortexa53/openwrt-sdk-19.07.4-sunxi-cortexa53_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/samsung/s5pv210/openwrt-sdk-19.07.4-samsung-s5pv210_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/x86/legacy/openwrt-sdk-19.07.4-x86-legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/x86/geode/openwrt-sdk-19.07.4-x86-geode_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mxs/generic/openwrt-sdk-19.07.4-mxs_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/mvebu/cortexa53/openwrt-sdk-19.07.4-mvebu-cortexa53_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/x86/generic/openwrt-sdk-19.07.4-x86-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/x86/64/openwrt-sdk-19.07.4-x86-64_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/imx6/generic/openwrt-sdk-19.07.4-imx6_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/cns3xxx/generic/openwrt-sdk-19.07.4-cns3xxx_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/gemini/generic/openwrt-sdk-19.07.4-gemini_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm2708/bcm2708/openwrt-sdk-19.07.4-brcm2708-bcm2708_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm63xx/smp/openwrt-sdk-19.07.4-brcm63xx-smp_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm2708/bcm2709/openwrt-sdk-19.07.4-brcm2708-bcm2709_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm63xx/generic/openwrt-sdk-19.07.4-brcm63xx-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ath79/tiny/openwrt-sdk-19.07.4-ath79-tiny_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm47xx/legacy/openwrt-sdk-19.07.4-brcm47xx-legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm47xx/mips74k/openwrt-sdk-19.07.4-brcm47xx-mips74k_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm2708/bcm2710/openwrt-sdk-19.07.4-brcm2708-bcm2710_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/bcm53xx/generic/openwrt-sdk-19.07.4-bcm53xx_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ath79/nand/openwrt-sdk-19.07.4-ath79-nand_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ar71xx/nand/openwrt-sdk-19.07.4-ar71xx-nand_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ath79/generic/openwrt-sdk-19.07.4-ath79-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ar71xx/tiny/openwrt-sdk-19.07.4-ar71xx-tiny_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ar71xx/mikrotik/openwrt-sdk-19.07.4-ar71xx-mikrotik_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ipq40xx/generic/openwrt-sdk-19.07.4-ipq40xx-generic_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ath25/generic/openwrt-sdk-19.07.4-ath25_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/armvirt/64/openwrt-sdk-19.07.4-armvirt-64_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/armvirt/32/openwrt-sdk-19.07.4-armvirt-32_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/ar71xx/generic/openwrt-sdk-19.07.4-ar71xx-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/at91/sam9x/openwrt-sdk-19.07.4-at91-sam9x_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/brcm47xx/generic/openwrt-sdk-19.07.4-brcm47xx-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-          - https://downloads.openwrt.org/releases/19.07.4/targets/at91/sama5/openwrt-sdk-19.07.4-at91-sama5_gcc-7.5.0_musl_eabi.Linux-x86_64.tar.xz
+          - https://downloads.openwrt.org/releases/19.07.7/targets/x86/64/openwrt-sdk-19.07.7-x86-64_gcc-7.5.0_musl.Linux-x86_64.tar.xz
         include:
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/apm821xx/sata/openwrt-sdk-19.07.4-apm821xx-sata_gcc-7.5.0_musl.Linux-x86_64.tar.xz
+          - download-url: https://downloads.openwrt.org/releases/19.07.7/targets/x86/generic/openwrt-sdk-19.07.7-x86-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
             beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/mpc85xx/p2020/openwrt-sdk-19.07.4-mpc85xx-p2020_gcc-7.5.0_musl.Linux-x86_64.tar.xz
+          - download-url: https://downloads.openwrt.org/releases/19.07.7/targets/x86/geode/openwrt-sdk-19.07.7-x86-geode_gcc-7.5.0_musl.Linux-x86_64.tar.xz
             beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/mpc85xx/p1020/openwrt-sdk-19.07.4-mpc85xx-p1020_gcc-7.5.0_musl.Linux-x86_64.tar.xz
+          - download-url: https://downloads.openwrt.org/releases/19.07.7/targets/x86/legacy/openwrt-sdk-19.07.7-x86-legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz
             beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/mpc85xx/generic/openwrt-sdk-19.07.4-mpc85xx-generic_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-            beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/octeon/generic/openwrt-sdk-19.07.4-octeon_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-            beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/apm821xx/nand/openwrt-sdk-19.07.4-apm821xx-nand_gcc-7.5.0_musl.Linux-x86_64.tar.xz
-            beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/arc770/generic/openwrt-sdk-19.07.4-arc770-generic_gcc-8.3.0_uClibc.Linux-x86_64.tar.xz
-            beta: true
-          - download-url: https://downloads.openwrt.org/releases/19.07.4/targets/archs38/generic/openwrt-sdk-19.07.4-archs38-generic_gcc-8.3.0_uClibc.Linux-x86_64.tar.xz
-            beta: true
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: create-release
     continue-on-error: ${{ matrix.beta }}
     steps:
       - uses: actions/checkout@v2
       - name: login
         run: echo "${{ secrets.docker_password }}" | docker login -u "${{ secrets.docker_username }}" --password-stdin
       - name: env
-        run: echo arch=$(echo ${{ matrix.download-url }} | sed -e 's/.*openwrt-sdk-19.07.4-\(.*\)_gcc.*/\1/') >> $GITHUB_ENV
+        run: echo arch=$(echo ${{ matrix.download-url }} | sed -e 's/.*openwrt-sdk-19.07.7-\(.*\)_gcc.*/\1/') >> $GITHUB_ENV
       - name: build
         run: docker build --build-arg URL=${{ matrix.download-url }} -t ${{ secrets.docker_repo }}:${{ env.arch }} .
       - name: push
@@ -131,12 +60,12 @@ jobs:
           asset_content_type: application/zip
   publish-release:
     name: publish-release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: 
       - create-release
       - build-package
     steps:
-      - uses: eregon/publish-release@v1
+      - uses: mwftts/publish-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

Dockerfile

@@ -11,10 +11,17 @@ ARG URL
 RUN curl -s -O $URL
 RUN FILE="${URL##*/}" && tar xf "${FILE}" &&  mv "${FILE%.*.*}" sdk
 RUN git clone https://github.com/xiaorouji/openwrt-passwall.git
+RUN echo "src-git dependencies https://github.com/Lienol/openwrt-packages.git;19.07" >> feeds.conf.default
+RUN echo "src-git dependencies https://github.com/kenzok8/small.git" >> feeds.conf.default
 
 WORKDIR /build/sdk
+RUN ./scripts/feeds clean
+RUN ./scripts/feeds update -a
+RUN ./scripts/feeds install -a
+RUN ./scripts/feeds uninstall xray-core
+RUN ./scripts/feeds install -p passwall -f xray-core
 RUN cp -r ../openwrt-passwall/brook package/
-RUN cp -r ../openwrt-passwall/v2ray package/
+#RUN cp -r ../openwrt-passwall/v2ray package/
 RUN cp -r ../openwrt-passwall/xray package/
 RUN cp -r ../openwrt-passwall/trojan-plus package/
 RUN cp -r ../openwrt-passwall/trojan-go package/
@@ -31,12 +38,11 @@ RUN cp -r ../openwrt-passwall/v2ray-plugin package/
 RUN cp -r ../openwrt-passwall/simple-obfs package/
 RUN cp -r ../openwrt-passwall/luci-app-passwall package/
 RUN ln -s `which upx` staging_dir/host/bin/upx  
-RUN echo "src-git dependencies https://github.com/Lienol/openwrt-packages.git;19.07" >> feeds.conf.default
 
 # Config
 RUN make defconfig
 RUN sed -i 's/CONFIG_PACKAGE_brook=m/CONFIG_PACKAGE_brook=y/g' .config
-RUN sed -i 's/CONFIG_PACKAGE_v2ray=m/CONFIG_PACKAGE_v2ray=y/g' .config
+#RUN sed -i 's/CONFIG_PACKAGE_v2ray=m/CONFIG_PACKAGE_v2ray=y/g' .config
 RUN sed -i 's/CONFIG_PACKAGE_xray=m/CONFIG_PACKAGE_xray=y/g' .config
 RUN sed -i 's/CONFIG_PACKAGE_trojan-plus=m/CONFIG_PACKAGE_trojan-plus=y/g' .config
 RUN sed -i 's/CONFIG_PACKAGE_trojan-go=m/CONFIG_PACKAGE_trojan-go=y/g' .config
@@ -65,11 +71,12 @@ RUN echo "CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG=y" >> .config
 
 # Compile 
 RUN ./scripts/feeds update -a
+RUN ./scripts/feeds install -a
 RUN ./scripts/feeds install pcre boost libev luci-base
 RUN ./scripts/feeds install -p dependencies golang
 
 RUN make package/brook/compile V=99
-RUN make package/v2ray/compile V=99
+#RUN make package/v2ray/compile V=99
 RUN make package/xray/compile V=99
 RUN make package/trojan-plus/compile V=99
 RUN make package/trojan-go/compile V=99
@@ -104,7 +111,7 @@ RUN mv `find /build/sdk/bin/packages/ | grep v2ray-plugin` .
 RUN mv `find /build/sdk/bin/packages/ | grep simple-obfs` .
 RUN mv `find /build/sdk/bin/packages/ | grep chinadns-ng` .
 RUN mv `find /build/sdk/bin/packages/ | grep shadowsocksr-libev` .
-RUN mv `find /build/sdk/bin/packages/ | grep v2ray` .
+#RUN mv `find /build/sdk/bin/packages/ | grep v2ray` .
 RUN mv `find /build/sdk/bin/packages/ | grep luci-app-passwall` .
 
 ENTRYPOINT ["/bin/bash", "-c", "python3 -u -m http.server -b `awk 'END{print $1}' /etc/hosts` 80"]

README.md

@@ -1,2 +1,5 @@
-# openwrt-gfw ![.github/workflows/build.yml](https://github.com/ir20/openwrt-gfw/workflows/.github/workflows/build.yml/badge.svg)
-openwrt 19.07.4 Shadowsocksr/kcptun/V2ray/trojan/brook 透明代理+ChinaDNS 编译
+![.github/workflows/build.yml](https://github.com/mwftts/openwrt-gfw/workflows/.github/workflows/build.yml/badge.svg)
+
+OpenWrt 19.07.6 Packages
+
+Thanks @ir20/openwrt-gfw

spider.py

@@ -4,11 +4,11 @@
 
 class UrlSpider(CrawlSpider):
     name = "url"
-    start_urls = ["https://downloads.openwrt.org/releases/19.07.4/targets/"]
+    start_urls = ["https://downloads.openwrt.org/releases/19.07.6/targets/"]
 
     rules = (
-        Rule(LinkExtractor(allow=("https://downloads.openwrt.org/releases/19.07.4/targets/.*/openwrt-sdk"), deny_extensions=()), callback="parse_item", process_request="method_head"),
-        Rule(LinkExtractor(allow=("https://downloads.openwrt.org/releases/19.07.4/targets/.*/$"), deny=("kmods/$", "packages/$")))
+        Rule(LinkExtractor(allow=("https://downloads.openwrt.org/releases/19.07.6/targets/.*/openwrt-sdk"), deny_extensions=()), callback="parse_item", process_request="method_head"),
+        Rule(LinkExtractor(allow=("https://downloads.openwrt.org/releases/19.07.6/targets/.*/$"), deny=("kmods/$", "packages/$")))
     )
 
     def parse_item(self, response):