Update and rename v18.yml to v18_code_and_v18_config.yml

2020-01-25 06:09:36 +08:00
parent 7f113909a3
commit 4101a54d2f
2 changed files with 80 additions and 130 deletions
--- a/.github/workflows/v18.yml
+++ b/.github/workflows/v18.yml
@@ -1,130 +0,0 @@
-#NanoPi-R1S H5 FriendlyWrt Build
-
-name: NanoPi-R1S H5 FriendlyWrt(18.06) Build
-
-on:
-  push:
-    paths:
-      - '.github/workflows/v18.yml'
-  # release:
-  #   types: [published]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@master
-        with:
-          ref: master
-
-      - name: Initialization Environment
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash
-          sudo apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git \
-          libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion \
-          flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo \
-          libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler \
-          g++ python python3 file ecj fastjar java-propose-classpath
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk
-          
-      - name: Download Source
-        run: |
-          mkdir friendlywrt-h5
-          cd friendlywrt-h5
-          repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v18.06.1 -m h5.xml --repo-url=https://github.com/friendlyarm/repo  --no-clone-bundle
-      
-      - name: Merge UpStearm OpenWrt
-        run: |
-          cd friendlywrt-h5
-          rm .repo/manifests/h5.xml
-          cp ../h5-18.06.xml .repo/manifests/h5.xml
-          repo sync -c  --no-clone-bundle
-
-      - name: Merge LEDE
-        run: |
-          cd friendlywrt-h5
-          git clone https://github.com/coolsnowwolf/lede
-          cd friendlywrt
-          cp -r ../lede/package/lean package/
-          #sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default
-          #sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default
-          echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default
-      
-      - name: Update Target.mk
-        run: |
-          cd friendlywrt-h5/friendlywrt/include
-          sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk
-          
-      - name: Custom Configure File
-        run: |
-          cd friendlywrt-h5
-          rm -f friendlywrt/.config*
-          cat > ./configs/config_h5 <<EOF
-          CONFIG_TARGET_sunxi=y
-          CONFIG_TARGET_sunxi_cortexa53=y
-          CONFIG_TARGET_sunxi_cortexa53_DEVICE_sun50i-h5-nanopi-neo-plus2=y
-          CONFIG_TARGET_PER_DEVICE_ROOTFS=y
-          CONFIG_IB=y
-          CONFIG_IMAGEOPT=y
-          CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
-          CONFIG_PACKAGE_ipv6helper=y
-          CONFIG_PACKAGE_luci-app-adbyby-plus=y
-          CONFIG_PACKAGE_luci-app-statistics=y
-          CONFIG_PACKAGE_luci-app-unblockmusic=y
-          CONFIG_PACKAGE_luci-app-vnstat=y
-          CONFIG_PACKAGE_luci-app-ssr-plus=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Server=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Socks=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y
-          CONFIG_PACKAGE_luci-app-ttyd=y
-          CONFIG_PACKAGE_luci-app-wrtbwmon=y
-          CONFIG_PACKAGE_luci-app-netdata=y
-          CONFIG_PACKAGE_luci-theme-argon=y
-          CONFIG_PACKAGE_luci-theme-netgear=y
-          CONFIG_PACKAGE_luci-theme-rosy=y
-          CONFIG_PACKAGE_curl=y
-          CONFIG_PACKAGE_htop=y
-          CONFIG_PACKAGE_nano=y
-          CONFIG_PACKAGE_screen=y
-          CONFIG_PACKAGE_tree=y
-          CONFIG_PACKAGE_vim-fuller=y
-          CONFIG_PACKAGE_wget=y
-          CONFIG_PACKAGE_collectd-mod-ping=y
-          CONFIG_PACKAGE_collectd-mod-thermal=y
-          CONFIG_PACKAGE_collectd-mod-cpufreq=y
-          # CONFIG_FEED_rosy is not set
-          EOF
-          cat ./configs/config_h5
-          
-      - name: Build FriendlyWrt
-        run: |
-          cd friendlywrt-h5
-          sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
-          ./build.sh nanopi_r1s.mk
-      
-      - name: Zip Files
-        run: |
-          #find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {}
-          gzip friendlywrt-h5/out/*.img
-          
-      - name: Assemble Artifact
-        run: |
-          rm -rf ./artifact/
-          mkdir -p ./artifact/
-          #find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/
-          mv friendlywrt-h5/out/*img* ./artifact/
-          cp friendlywrt-h5/friendlywrt/.config ./artifact/
-      - name: Upload Artifact
-        uses: actions/upload-artifact@master
-        with:
-          name: FriendlyWrt_NanoPi-R1S
-          path: ./artifact/
--- a/.github/workflows/v18_code_and_v18_config.yml
+++ b/.github/workflows/v18_code_and_v18_config.yml
@@ -0,0 +1,80 @@
+name: v18_code_and_v18_config Build
+
+on:
+  push:
+    paths:
+      - '.github/workflows/v18_code_and_v18_config.yml'
+
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          ref: master
+
+      - name: Initialization Environment
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          sudo rm -rf /etc/apt/sources.list.d
+          sudo apt-get update
+          sudo apt-get -y install bc build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler g++ python python3 file ecj fastjar java-propose-classpath
+          wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk
+          
+      - name: Install Repo
+        run: |
+          git clone https://github.com/friendlyarm/repo
+          sudo cp repo/repo /usr/bin/
+          
+      - name: Download Source
+        run: |
+          mkdir friendlywrt-h5
+          cd friendlywrt-h5
+          repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo  --no-clone-bundle
+          
+      - name: Mods
+        run: |
+          cd friendlywrt-h5
+          rm -f .repo/manifests/h5.xml
+          cp ../h5-18.06.xml .repo/manifests/h5.xml
+          repo sync -c  --no-clone-bundle
+          curl 'https://raw.githubusercontent.com/friendlyarm/friendlywrt_device_h5/286a065e7832458ccd17a5d4cf4dd52a547fa34d/h5/nanopi_r1s.mk' > device/friendlyelec/h5/nanopi_r1s.mk
+          curl 'https://github.com/friendlyarm/friendlywrt_device_h5/raw/a198d92e1d64bcde2d4169f2e680f5fff1dc80a9/h5/common-files/etc/opkg/distfeeds.conf' > device/friendlyelec/h5/common-files/etc/opkg/distfeeds.conf
+          sed -i '/=m/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/CONFIG_DEVEL/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d' configs/config_h5
+          sed -i '/CONFIG_TARGET_MULTI_PROFILE/d' configs/config_h5
+          sed -i 's/CONFIG_TARGET_DEVICE/CONFIG_TARGET/' configs/config_h5
+          sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
+          
+      - name: Clean Feeds
+        run: |
+          cd friendlywrt-h5/friendlywrt
+          ./scripts/feeds clean -a
+                    
+      - name: Build FriendlyWrt
+        run: |
+          cd friendlywrt-h5
+          sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
+          ./build.sh nanopi_r1s.mk
+      
+      - name: Zip Files
+        run: |
+          gzip friendlywrt-h5/out/*.img
+      - name: Assemble Artifact
+        run: |
+          rm -rf ./artifact/
+          mkdir -p ./artifact/
+          mv friendlywrt-h5/out/*img* ./artifact/
+          cp friendlywrt-h5/friendlywrt/.config ./artifact/
+      - name: Upload Artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: FriendlyWrt_NanoPi-R1S
+          path: ./artifact/