fix: compress

.gitlab-ci.yml

@@ -28,7 +28,7 @@ deploy:
     - master
   script:
     - yarn
-    - sh utils/imageCompress.sh
+    # - sh utils/imageCompress.sh
     - npm run export
     - rm -rf /home/gitlab-runner/deploy/official/out/
     - echo "预览页面已清除"
@@ -49,7 +49,7 @@ preview:
   #     - out
   script:
     - yarn
-    - sh utils/imageCompress.sh
+    # - sh utils/imageCompress.sh
     - npm run export
     - rm -r /home/gitlab-runner/deploy/official/out
     - cp -r out/ /home/gitlab-runner/deploy/official/

utils/commit.sh

-git status
+echo "`git diff --name-status HEAD~20 HEAD`" | grep ^A | grep -E "png|jpg|jpeg$" | awk '{for(i=2;i<=NF;++i) printf $i ;printf "\n"}' | xargs -I {}  utils/imageCompressHelper.sh {}
 if test -z "`git status | grep 'nothing to commit, working tree clean'`"
 then
   git stash
@@ -7,7 +7,7 @@ then
   git stash pop
   git add -A
   echo 'added'
-  git commit -am '自动文章合并'
+  git commit -am '自动文章合并 || 图片自动压缩'
   echo 'commited'
   git push git@git.gaorongvc.cn:lq/official.git
   exit 1