123

.github/workflows/merge-upstream.yml

@@ -1,7 +1,7 @@
 #
 # This is free software, lisence use MIT.
 # 
-# Copyright (C) 2019 KFERMercer <KFER.Mercer@gmail.com>
+# Copyright (C) 2020 KFERMercer <KFER.Mercer@gmail.com>
 # 
 # <https://github.com/KFERMercer/OpenWrt-CI>
 #
@@ -13,7 +13,7 @@ on:
     - cron: 30 19 * * *
   # push:
   #   branches: 
-  #     - master
+  #     - main
 
 jobs:
 
@@ -24,19 +24,32 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v2
       with:
         ref: master
         fetch-depth: 0
         lfs: true
 
-    - name: Set git identity
+    - name: Set git config
       run : |
-        git config --global user.email "KFER.Mercer@gmail.com"
-        git config --global user.name "KFERMercer"
+        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
+        git config --global pull.rebase false
+        git config --global --list
 
     - name: Load upstream commits
-      run: git pull https://github.com/coolsnowwolf/lede.git --no-edit
+      run: git pull https://github.com/coolsnowwolf/lede.git --log --no-commit
+
+    - name: Apply commit changes
+      run: |
+        if [ -f ./.git/MERGE_MSG ]; then
+        mkdir ./tmp && cp ./.git/MERGE_MSG ./tmp/message
+        sed -i "1c [bot] AutoMerging: merge all upstream's changes:" ./tmp/message
+        # sed -i '/^\#.*/d' ./tmp/message
+        git commit --file="./tmp/message"
+        else
+        echo "There is no merge commits."
+        fi
 
     - name: Push Commits
       env:

.github/workflows/openwrt-ci.yml

@@ -2,7 +2,7 @@
 # This is free software, lisence use MIT.
 # 
 # Copyright (C) 2019 P3TERX <https://p3terx.com>
-# Copyright (C) 2019 KFERMercer <KFER.Mercer@gmail.com>
+# Copyright (C) 2020 KFERMercer <KFER.Mercer@gmail.com>
 # 
 # <https://github.com/KFERMercer/OpenWrt-CI>
 #
@@ -14,20 +14,21 @@ on:
     - cron: 0 20 * * *
   release:
     types: [published]
-  # push:
-  #   branches: 
-  #     - master
 
 jobs:
 
   build:
 
+    name: Build OpenWrt firmware
+
     runs-on: ubuntu-latest
 
+    if: github.event.repository.owner.id == github.event.sender.id
+
     steps:
 
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
         with:
           ref: master
 
@@ -37,9 +38,9 @@ jobs:
         run: |
           docker rmi `docker images -q`
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d
-          sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php*
+          sudo -E apt-get -y purge ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* adoptopenjdk* mysql* php* mongodb* dotnet* moby* snapd* || true
           sudo -E apt-get update
-          sudo -E 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
+          sudo -E apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler antlr3 gperf swig libtinfo5
           sudo -E apt-get -y autoremove --purge
           sudo -E apt-get clean
 
@@ -81,10 +82,38 @@ jobs:
           du -h /mnt/openwrt/ --max-depth=1
 
       - name: Prepare artifact
-        run: find ./bin/targets/ -type d -name "packages" | xargs rm -rf {}
+        run: |
+          mkdir -p ./artifact/firmware
+          mkdir -p ./artifact/package
+          mkdir -p ./artifact/buildinfo
+          rm -rf $(find ./bin/targets/ -type d -name "packages")
+          cp -rf $(find ./bin/targets/ -type f) ./artifact/firmware/
+          cp -rf $(find ./bin/packages/ -type f -name "*.ipk") ./artifact/package/
+          cp -rf $(find ./bin/targets/ -type f -name "*.buildinfo" -o -name "*.manifest") ./artifact/buildinfo/
+
+      - name: Deliver buildinfo
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenWrt_buildinfo
+          path: ./artifact/buildinfo/
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@master
+      - name: Deliver package
+        uses: actions/upload-artifact@v2
         with:
-          name: OpenWrt firmware
+          name: OpenWrt_package
+          path: ./artifact/package/
+
+      - name: Deliver firmware
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenWrt_firmware
           path: ./bin/targets/
+
+      - name: Upload release asset
+        if: github.event == 'release'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.STANDARD }}
+          file: ./artifact/firmware/*
+          tag: ${{ github.ref }}
+          file_glob: true

.github/workflows/update-helloworld.yml

@@ -0,0 +1,59 @@
+#
+# This is free software, lisence use MIT.
+# 
+# Copyright (C) 2020 KFERMercer <KFER.Mercer@gmail.com>
+# 
+# <https://github.com/KFERMercer/OpenWrt-CI>
+#
+
+name: Update-helloworld
+
+on:
+  schedule:
+    - cron: 35 19 * * *
+
+jobs:
+
+  prepare:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: master
+        fetch-depth: 0
+        lfs: true
+
+    - name: Set git identity
+      run : |
+        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
+
+    - name: Load latest helloworld
+      run: |
+        git clone https://github.com/fw876/helloworld.git --depth=1 ./tmp/helloworld
+        rm -rf ./package/lean/luci-app-ssr-plus && cp -rf ./tmp/helloworld/luci-app-ssr-plus ./package/lean/
+        rm -rf ./package/lean/naiveproxy && cp -rf ./tmp/helloworld/naiveproxy ./package/lean/
+        rm -rf ./package/lean/shadowsocks-rust && cp -rf ./tmp/helloworld/shadowsocks-rust ./package/lean/
+        rm -rf ./package/lean/shadowsocksr-libev && cp -rf ./tmp/helloworld/shadowsocksr-libev ./package/lean/
+        rm -rf ./package/lean/simple-obfs && cp -rf ./tmp/helloworld/simple-obfs ./package/lean/
+        rm -rf ./package/lean/tcping && cp -rf ./tmp/helloworld/tcping ./package/lean/
+        rm -rf ./package/lean/trojan && cp -rf ./tmp/helloworld/trojan ./package/lean/
+        rm -rf ./package/lean/v2ray-core && cp -rf ./tmp/helloworld/v2ray-core ./package/lean/
+        rm -rf ./package/lean/v2ray-plugin && cp -rf ./tmp/helloworld/v2ray-plugin ./package/lean/
+        rm -rf ./package/lean/xray-core && cp -rf ./tmp/helloworld/xray-core ./package/lean/
+        rm -rf ./package/lean/xray-plugin && cp -rf ./tmp/helloworld/xray-plugin ./package/lean/
+
+    - name: Apply commit changes
+      run: |
+        git add ./package/lean/
+        echo -e "[bot] luci-app-ssr-plus: update\n\nlatest commit: $(cat ./tmp/helloworld/.git/refs/heads/master)" > ./tmp/message
+        git commit --file="./tmp/message" || exit 0
+
+    - name: Push Commits
+      env:
+        DOWNSTREAM_BRANCH: master
+      run: git push origin $DOWNSTREAM_BRANCH

.gitignore

@@ -24,5 +24,9 @@ key-build*
 .emacs.desktop*
 TAGS*~
 git-src
+.git-credentials
+/*.log
 .project
 .cproject
+.ccache
+.vscode*

BSDmakefile

@@ -1,7 +1,6 @@
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# Copyright (C) 2006 OpenWrt.org
+
 world ${.TARGETS}:
 	@gmake $@

COPYING

@@ -0,0 +1,12 @@
+OpenWrt is provided under:
+
+	SPDX-License-Identifier: GPL-2.0-only
+
+Being under the terms of the GNU General Public License version 2 only,
+according with:
+
+	LICENSES/GPL-2.0
+
+In addition, other licenses may also apply.
+
+All contributions to OpenWrt are subject to this COPYING file.

Config.in

@@ -1,8 +1,6 @@
-# Copyright (C) 2006-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# Copyright (C) 2006-2013 OpenWrt.org
 
 mainmenu "OpenWrt Configuration"