Merge pull request #267 from SonicCloudOrg/dev/2.0.0-alpha2

feat: add new plugins
SonicCloudOrg · Oct 9, 2022 · fe2b2fa · fe2b2fa
2 parents 577ec4f + f447112
commit fe2b2fa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,6 +27,14 @@ jobs:
         run: ver=${{ steps.previoustag.outputs.tag }} && new_ver=${ver:1} && sed -i "s/SONIC_VERSION/${new_ver}/g" pom.xml
       - name: login docker hub
         run: echo "${{ secrets.ACCESS_TOKEN }}" | docker login -u zhouyixun --password-stdin
+      - name: sas-download
+        uses: robinraju/release-downloader@v1.4
+        with:
+          repository: SonicCloudOrg/sonic-android-supply
+          latest: true
+          fileName: "*_linux_x86_64.tar.gz"
+      - name: sas
+        run: tar zxvf *_linux_x86_64.tar.gz && rm *_linux_x86_64.tar.gz && rm plugins/sonic-android-supply* && mv sas plugins/sonic-android-supply
       - name: sgm-download
         uses: robinraju/release-downloader@v1.4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,6 +60,14 @@ jobs:
         run: cp -r target/sonic-agent-${{ matrix.platform }}.jar sonic-agent-${{ steps.previoustag.outputs.tag }}-${{matrix.depend}}/
       - name: copy
         run: cp -r config/ mini/ sonic-agent-${{ steps.previoustag.outputs.tag }}-${{matrix.depend}}/
+      - name: sas-download
+        uses: robinraju/release-downloader@v1.4
+        with:
+          repository: SonicCloudOrg/sonic-android-supply
+          latest: true
+          fileName: "*"
+      - name: sas-untar
+        run: tar zxvf *_${{matrix.depend}}.tar.gz && rm *_${{matrix.depend}}.tar.gz && mv sas${{matrix.tail}} sonic-agent-${{ steps.previoustag.outputs.tag }}-${{matrix.depend}}/plugins/sonic-android-supply${{matrix.tail}}
       - name: sgm-download
         uses: robinraju/release-downloader@v1.4
         with:

diff --git a/plugins/sonic-android-supply.exe b/plugins/sonic-android-supply.exe
diff --git a/plugins/sonic-go-mitmproxy → plugins/sonic-go-mitmproxy.exe b/plugins/sonic-go-mitmproxy → plugins/sonic-go-mitmproxy.exe
diff --git a/plugins/sonic-ios-bridge → plugins/sonic-ios-bridge.exe b/plugins/sonic-ios-bridge → plugins/sonic-ios-bridge.exe
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -10,17 +10,15 @@ sonic:
   saa: 2.0.1
   sgm: 1.3.3
   sib: 1.2.0
-  sas: 0.0.1
+  sas: 0.0.2
   saus: 5.7.0
 
 logging:
   file:
-    #日志路径
     name: logs/sonic-agent.log
   logback:
     rollingpolicy:
       clean-history-on-start: true
-      #保留天数
       max-history: 3
   pattern:
     console: "%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}"