2020-03-06 17:14:26

.github/workflows/deploy.yaml

@@ -22,8 +22,8 @@ jobs:
       run: |
         git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 
   test-job:
@@ -38,7 +38,23 @@ jobs:
       run: |
         git fetch origin ${BRANCH_NAME}
         git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
+        bash ./tools/gitsync.sh pack 
+        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
+
+  dev-job:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+
+    - name: Pack And Deploy
+      env:
+        BRANCH_NAME: dev
+      run: |
+        git fetch origin ${BRANCH_NAME}
+        git checkout ${BRANCH_NAME}
+        git clone -b ${BRANCH_NAME} ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles ${BRANCH_NAME} ${CO_REF}
 

.github/workflows/main.yml

@@ -6,16 +6,12 @@ on:
     branchs:  
       - master
       - test
-    tags-ignore:
+      - dev
-      - deploy-*
-      - test-*
-      - master-*
-    ignore-paths:
-      - '.github'
-      - 'README.md'
   pull_request:
     branchs:  
       - master
+      - test
+      - dev
 
 jobs:
   publish:
@@ -30,6 +26,6 @@ jobs:
 
     - name: Pack And Deploy
       run: |
+        git clone -b `basename ${BRANCH_NAME}` ${CO_REF}
         bash ./tools/gitsync.sh pack 
-        bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${GH_REF}
         bash ./tools/gitsync.sh deploy mbfiles `basename ${BRANCH_NAME}` ${CO_REF}

.gitlab-ci.yml

@@ -0,0 +1,79 @@
+image: lholota/bash-git:latest
+
+stages:
+  - deploy
+
+deploy:branchs:
+  stage: deploy
+  only:        
+    - master
+    - test
+  script:
+    - apk add git-lfs
+    - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    # - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GH_REF}/monlor/mbfiles.git
+
+# deploy:dev:
+#   stage: deploy
+#   only:        
+#     - dev
+#   script:
+#     - apk add git-lfs
+#     - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+#     - bash -e ./tools/gitsync.sh pack
+#     - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+
+deploy:master:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin master
+    - git checkout master
+    - git clone -b master ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles master ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: master
+    untracked: true
+
+deploy:test:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin test
+    - git checkout test
+    - git clone -b test ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles test ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: test
+    untracked: true
+
+syncode:github:
+  stage: deploy
+  only:        
+    - master
+    - test
+    - dev
+  script:
+    - git fetch origin ${CI_COMMIT_REF_NAME}
+    - git checkout ${CI_COMMIT_REF_NAME}
+    - git push ${GH_REF}/monlor/MIXBOX.git ${CI_COMMIT_REF_NAME}:${CI_COMMIT_REF_NAME}
+
+# cache:
+#   key: ${CI_COMMIT_REF_NAME}
+#   untracked: true
+#   paths: 
+#     - mbfiles/
+

README.md

@@ -1,6 +1,6 @@
 # MIXBOX 
 
-![](https://github.com/monlor/MIXBOX/workflows/Main-CI/badge.svg)
+![](https://github.com/monlor/MIXBOX/workflows/Master-CI/badge.svg)
 
 > MIXBOX是一款全新的，完全基于Shell脚本的工具箱，为在路由器上实现程序的快速配置及运行管理，欢迎大佬们stars、fork及pr.
 

apps/mixbox/config/mixbox.uci

@@ -3,5 +3,5 @@ appname="mixbox"
 needver=""
 supports="linux_arm,linux_mips,linux_x86_64"
 appinfo="一款支持多平台，多架构的Shell工具箱"
-newinfo="新增base64_encode工具"
+newinfo="修复插件安装失败的bug"
-version="0.1.9.1"
+version="0.1.9.3"

apps/mixbox/scripts/helper.sh

@@ -9,14 +9,14 @@ wgetsh() {
 	[ ! -d "$wgetfiledir" ] && mkdir -p $wgetfiledir
 	[ ! -d ${mbtmp} ] && mkdir -p ${mbtmp}
 	rm -rf ${mbtmp}/${wgetfilename}
-	if command -v wget-ssl &> /dev/null; then
+	if command -v curl &> /dev/null; then
-		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
-		[ $? -eq 0 ] && result="200"
-	else
 		result1=$(curl -skL --connect-timeout 10 -m 20 -w %{http_code} -o "${mbtmp}/${wgetfilename}" "$wgeturl")
+	else
+		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O "${mbtmp}/${wgetfilename}" "$wgeturl"
+		[ $? -eq 0 ] && result1="200"
 	fi
 	[ -f "${mbtmp}/${wgetfilename}" ] && result2=$(du -sh "${mbtmp}/${wgetfilename}" 2> /dev/null | awk '{print$1}')
-	if [ "$result" = "200" ] && [ "$result2" != '0' ]; then
+	if [ "$result1" = "200" ] && [ "$result2" != '0' ]; then
 		chmod +x ${mbtmp}/${wgetfilename} > /dev/null 2>&1
 		mv -f ${mbtmp}/${wgetfilename} $wgetfilepath > /dev/null 2>&1
 		return 0
@@ -40,7 +40,7 @@ base_encode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if command -v base64-encode &> /dev/null; then
+		if base64-encode &> /dev/null; then
 			echo -n "$*" | base64-encode
 		else
 			echo -n "$*" | baseutil --b64
@@ -52,7 +52,7 @@ base_decode() {
 	if [ -z "${1}" ]; then
 		echo -n "" 
 	else
-		if command -v base64-decode &> /dev/null; then
+		if base64-decode &> /dev/null; then
 			echo -n "$*" | base64-decode
 		else
 			echo -n "$*" | baseutil --b64 -d

backup/.gitlab-ci-template.yaml

@@ -0,0 +1,81 @@
+# 定义 stages（阶段）。任务将按此顺序执行。
+stages:
+  - build
+  - test
+  - deploy
+
+# 定义 job（任务）
+job1:
+  stage: test
+  tags:
+    - XX #只有标签为XX的runner才会执行这个任务
+  only:        
+    - dev    #只有dev分支提交代码才会执行这个任务。也可以是分支名称或触发器名称
+    - /^future-.*$/ #正则表达式，只有future-开头的分支才会执行
+  script:
+    - echo "I am job1"
+    - echo "I am in test stage"
+
+# 定义 job
+job2:
+  stage: test    #如果此处没有定义stage，其默认也是test
+  only:
+    - master    #只有master分支提交代码才会执行这个任务
+  script:
+    - echo "I am job2"
+    - echo "I am in test stage"
+  allow_failure: true #允许失败，即不影响下步构建    
+
+# 定义 job
+job3:
+  stage: build
+  except:    
+    - dev #除了dev分支，其它分支提交代码都会执行这个任务
+  script:
+    - echo "I am job3"
+    - echo "I am in build stage"    
+  when: always #不管前面几步成功与否，永远会执行这一步。它有几个值：on_success （默认值）\on_failure\always\manual（手动执行）
+    
+# 定义 job
+.job4:    #对于临时不想执行的job，可以选择在前面加个"."，这样就会跳过此步任务，否则你除了要注释掉这个jobj外，还需要注释上面为deploy的stage
+  stage: deploy
+  script:
+    - echo "I am job4"    
+
+# 模板，相当于公用函数，有重复任务时很有用
+.job_template: &job_definition  # 创建一个锚，'job_definition'
+  image: ruby:2.1
+  services:
+    - postgres
+    - redis
+
+test1:
+  <<: *job_definition           # 利用锚'job_definition'来合并
+  script:
+    - test1 project
+
+test2:
+  <<: *job_definition           # 利用锚'job_definition'来合并
+  script:
+    - test2 project    
+
+#下面几个都相当于全局变量，都可以添加到具体job中，这时会被子job的覆盖    
+
+before_script:
+  - echo "每个job之前都会执行"    
+  
+after_script:
+  - echo "每个job之后都会执行"    
+  
+variables:    #变量
+  DATABASE_URL: "postgres://postgres@postgres/my_database"  #在job中可以用${DATABASE_URL}来使用这个变量。常用的预定义变量有CI_COMMIT_REF_NAME（项目所在的分支或标签名称），CI_JOB_NAME（任务名称），CI_JOB_STAGE（任务阶段）
+  GIT_STRATEGY: "none" #GIT策略，定义拉取代码的方式，有3种：clone/fetch/none，默认为clone，速度最慢，每步job都会重新clone一次代码。我们一般将它设置为none，在具体任务里设置为fetch就可以满足需求，毕竟不是每步都需要新代码，那也不符合我们测试的流程
+
+cache:    #缓存
+  #因为缓存为不同管道和任务间共享，可能会覆盖，所以有时需要设置key
+  key: ${CI_COMMIT_REF_NAME}  # 启用每分支缓存。
+  #key: "$CI_JOB_NAME/$CI_COMMIT_REF_NAME" # 启用每个任务和每个分支缓存。需要注意的是，如果是在windows中运行这个脚本，需要把$换成%
+  untracked: true    #缓存所有Git未跟踪的文件
+  paths:    #以下2个文件夹会被缓存起来，下次构建会解压出来
+    - node_modules/
+    - dist/  

backup/.gitlab-ci.yml

@@ -0,0 +1,79 @@
+image: lholota/bash-git:latest
+
+stages:
+  - deploy
+
+deploy:branchs:
+  stage: deploy
+  only:        
+    - master
+    - test
+  script:
+    - apk add git-lfs
+    - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    # - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+    - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GH_REF}/monlor/mbfiles.git
+
+# deploy:dev:
+#   stage: deploy
+#   only:        
+#     - dev
+#   script:
+#     - apk add git-lfs
+#     - git clone -b ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git 
+#     - bash -e ./tools/gitsync.sh pack
+#     - bash ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+
+deploy:master:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin master
+    - git checkout master
+    - git clone -b master ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles master ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: master
+    untracked: true
+
+deploy:test:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
+    - apk add git-lfs
+    - git fetch origin test
+    - git checkout test
+    - git clone -b test ${GL_REF}/monlor/mbfiles.git 
+    - bash -e ./tools/gitsync.sh pack
+    - bash ./tools/gitsync.sh deploy mbfiles test ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: test
+    untracked: true
+
+syncode:github:
+  stage: deploy
+  only:        
+    - master
+    - test
+    - dev
+  script:
+    - git fetch origin ${CI_COMMIT_REF_NAME}
+    - git checkout ${CI_COMMIT_REF_NAME}
+    - git push ${GH_REF}/monlor/MIXBOX.git ${CI_COMMIT_REF_NAME}:${CI_COMMIT_REF_NAME}
+
+# cache:
+#   key: ${CI_COMMIT_REF_NAME}
+#   untracked: true
+#   paths: 
+#     - mbfiles/
+

install.sh

@@ -47,11 +47,11 @@ fi
 
 logsh "【Tools】" "下载工具箱文件..."
 rm -rf ${mbtmp}/mixbox.tar.gz > /dev/null 2>&1
-if command -v wget-ssl &> /dev/null; then
+if command -v curl &> /dev/null; then
+	result=$(curl -w %{http_code} -skLo ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz)
+else
 	wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz
 	[ $? -eq 0 ] && result="200"
-else
-	result=$(curl -w %{http_code} -skLo ${mbtmp}/mixbox.tar.gz ${mburl}/appstore/mixbox_${model}.tar.gz)
 fi
 [ "$result" != "200" ] && logsh "【Tools】" "文件下载失败！" && exit 1
 logsh "【Tools】" "解压工具箱文件"

tools/gitsync.sh

@@ -59,22 +59,34 @@ gerneral_applist() {
 
 pack() {
 
+	local pack_dir="${1:-mbfiles}"
+
 	rm -rf appstore/
-	rm -rf mbfiles/
 
 	echo "开始打包插件..."
  	mkdir appstore
 	ls apps/ | while read line; do
+		# 取用缓存数据
+		if [ -f ${pack_dir}/applist.txt ]; then
+			version_old=`cat ${pack_dir}/applist.txt | grep "$line|" | cut -d'|' -f4`
+			version_new=`cat apps/$line/config/$line.uci | grep "version=" | cut -d'=' -f2 | sed -e 's/"//g'`
+			[ "$version_new" = "$version_old" ] && echo "$line未更新，跳过打包..." && continue
+		fi
 		pack_app $line
 	done
 	gerneral_applist
 
-	mkdir mbfiles
+	test ! -d ${pack_dir}/appstore && mkdir -p ${pack_dir}/appstore
-	cp -rf appsbin/ mbfiles/appsbin/
+	test ! -d ${pack_dir}/temp && mkdir -p ${pack_dir}/temp
-  cp -rf temp/ mbfiles/temp/
+	test ! -d ${pack_dir}/appsbin && mkdir -p ${pack_dir}/appsbin
-  cp -rf install.sh mbfiles/
+	
-  mv -f appstore/ mbfiles/appstore/
+	cp -rf appsbin/* ${pack_dir}/appsbin/
-  mv -f applist.txt mbfiles/
+  cp -rf temp/* ${pack_dir}/temp/
+  cp -rf install.sh ${pack_dir}/
+  mv -f appstore/* ${pack_dir}/appstore/
+  mv -f applist.txt ${pack_dir}/
+
+  rm -rf appstore/
 	
 }
 
@@ -107,13 +119,23 @@ deploy() {
 	sed -Ei "s#mbfiles/git/raw/[a-z]+#mbfiles/git/raw/$2#" $1/install.sh
 
 	cd $1
+	if [ ! -d ".git" ]; then
 	  git init
+	fi
 	git config --local user.email "monlor@qq.com"
 	git config --local user.name "monlor"
+
+	git lfs install
+  rm -rf .gitattributes
+  git lfs track "*_linux_*"
+  git lfs track "*_darwin_*"
+
+	if git status &> /dev/null; then
 	  git add .
 	  git commit -m "$(TZ='Asia/Shanghai' date "+%Y-%m-%d %H:%M:%S")" -a
-  git push "$3" master:"$2" -f 
+	fi
-
+	git lfs push "$3" --all
+  git push "$3"
 }
 
 case $1 in