From f82e4a385437f784e3d055d5adab50b33d6315bf Mon Sep 17 00:00:00 2001 From: yicheng <11733500+yichengchen@users.noreply.github.com> Date: Fri, 18 Dec 2020 21:27:50 +0800 Subject: [PATCH] chore: update core [appcenter] [notarize] --- .github/workflows/main.yml | 5 +-- .travis.yml.backup | 59 --------------------------------- ClashX/Info.plist | 4 +-- ClashX/goClash/build_clash.py | 5 +++ ClashX/goClash/go.mod | 2 +- ClashX/goClash/go.sum | 4 +-- ClashX/goClash/upgrade_core.py | 6 ++-- dist.p12.enc | Bin 3360 -> 0 bytes 8 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 .travis.yml.backup delete mode 100644 dist.p12.enc diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed73182..3b933c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,6 @@ name: ClashX on: [push] -env: - DEVELOPER_DIR: /Applications/Xcode_12.2.app - jobs: build: runs-on: macOS-latest @@ -13,7 +10,7 @@ jobs: - name: import certs run: | echo `/usr/bin/xcodebuild -version` - openssl aes-256-cbc -k "${{ secrets.ENCRYPTION_SECRET }}" -in ".github/certs/dist.p12.enc" -d -a -out ".github/certs/dist.p12" + openssl aes-256-cbc -k "${{ secrets.ENCRYPTION_SECRET }}" -in ".github/certs/dist.p12.enc" -d -a -out ".github/certs/dist.p12" -md md5 gem install bundler:1.16.2 bundle install diff --git a/.travis.yml.backup b/.travis.yml.backup deleted file mode 100644 index 13ce012..0000000 --- a/.travis.yml.backup +++ /dev/null @@ -1,59 +0,0 @@ -language: objective-c -osx_image: xcode11 -node_js: 10 -before_install: -- openssl aes-256-cbc -K $encrypted_a43c9d4ca4d4_key -iv $encrypted_a43c9d4ca4d4_iv - -in dist.p12.enc -out scripts/travis/dist.p12 -d -- security create-keychain -p mysecretpassword build.keychain -- security default-keychain -s build.keychain -- security unlock-keychain -p mysecretpassword build.keychain -- security set-keychain-settings -t 3600 -u build.keychain -- security import ./scripts/travis/dist.p12 -k build.keychain -T /usr/bin/codesign - -P "" -- 'security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain' -install: -- bash install_dependency.sh -- cd $TRAVIS_BUILD_DIR/ClashX -- echo `go version` -- brew update -- brew upgrade go || true -- echo `go version` -- python3 build_clash.py -- cd $TRAVIS_BUILD_DIR - -script: -- 'set -o pipefail && xcodebuild -workspace ClashX.xcworkspace -scheme "ClashX" build CODE_SIGN_IDENTITY="Developer - ID Application: Fuzhou West2Online Internet Inc. (MEWHFZ92DY)"|xcpretty' -- echo "Checking SMJobBless Vailded" -- build_dir=`xcodebuild -workspace ClashX.xcworkspace -scheme "ClashX" -showBuildSettings -configuration Debug | grep -m 1 "TARGET_BUILD_DIR" | grep -oEi "\/.*"` -- build_dir=${build_dir}"/ClashX.app" -- python SMJobBlessUtil.py check ${build_dir} -- echo "Check completed" - -before_deploy: -- gem install gym -- bundle install -- fastlane gym -s ClashX -- npm install --global create-dmg -- create-dmg ClashX.app -- mv ClashX*.dmg ClashX.dmg -- fastlane run notarize package:"./ClashX.dmg" bundle_id:"com.west2online.ClashX" - -deploy: - provider: releases - prerelease: false - skip_cleanup: true - api_key: - secure: YKO96FhN1JgvM+EiyciNQCu8nk/t87txxCEA5//XuKGKh+75tVyB+udmEL4sQL2R01vuShO5WwXLRulHkDsVFjNgvTGa64cdG6SMNORMI+mEuBW2L/RPtkaK1GAY+l+iGkH9i1Ng0SaDqL8xSc5rkqicdUV9NSDrg3k+Ck0pu/DvHgwHAmIjN0JG73TuQKfENDlwoa/uj6ztXpxGR30vgobqaex8wwGV+9fs8Jfbh3cO/79iGXweRhJptvvW0EAF1vV95KyEaUYtHP+7NYVVapOCWwek2irdn1HBm4pRib/0bHh/wFQgnI9OoQbKYuKNc6xRnt9h0wWh+SSIwRA1X7jiZTipli+7G2HGXpvW0r8jMskhYxqjcRH5EWB8rGXoiy/16GUuY1SK1ID/oW9nSh5ws6quaRBmpXGyJcoOUq9STsF+HVOF1DOX4qRt8B7049ytdKIRNe3QGmOlc8w3Nyi5y/v9CHWmVWRrKvzJ8qXP/+JJlFIsXhZR+TYqosiX2ZoKpanLv1RFFbU5FxqdaQapQX465FlpoD/6Qhv+2WLmLBgI1+ewR6g/wjLus6unVu4C3ztYov/9Y7OhYlfD+CqdzKOn+98gGAPRV92MfFh8Qa6rXjsVbP4dC09zKze/+OZtCXr36C5M40MYIChVuSUlDSG4IhElylboSYvQ/wQ= - file: - - ClashX.dmg - - on: - repo: yichengchen/clashX - branch: master - tags: true - prerelease: true - -after_deploy: -- 'curl -u yichengchen:$GitHub_Token -X POST https://api.github.com/repos/yichengchen/clashX/pages/builds -H "Accept: application/vnd.github.mister-fantastic-preview+json"' -- fastlane run upload_symbols_to_crashlytics diff --git a/ClashX/Info.plist b/ClashX/Info.plist index 4d4939a..92aaa22 100644 --- a/ClashX/Info.plist +++ b/ClashX/Info.plist @@ -2,8 +2,6 @@ - CFBundleIconFile - AppIcon BETA CFBundleDevelopmentRegion @@ -25,6 +23,8 @@ CFBundleExecutable $(EXECUTABLE_NAME) + CFBundleIconFile + AppIcon CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/ClashX/goClash/build_clash.py b/ClashX/goClash/build_clash.py index eaade9a..df5a7e3 100644 --- a/ClashX/goClash/build_clash.py +++ b/ClashX/goClash/build_clash.py @@ -10,6 +10,11 @@ def get_version(): return line.split("-")[-1].strip()[:6] return "unknown" +def get_full_version(): + with open('./go.mod') as file: + for line in file.readlines(): + if "clash" in line and "ClashX" not in line: + return line.split(" ")[-1].strip() def build_clash(version): build_time = datetime.datetime.now().strftime("%Y-%m-%d-%H%M") diff --git a/ClashX/goClash/go.mod b/ClashX/goClash/go.mod index 96aebd2..8eb843a 100644 --- a/ClashX/goClash/go.mod +++ b/ClashX/goClash/go.mod @@ -1,7 +1,7 @@ module github.com/yichengchen/clashX/ClashX require ( - github.com/Dreamacro/clash v1.3.1-0.20201124145223-0d33dc3eb9bc + github.com/Dreamacro/clash v1.3.1-0.20201217141727-4b1b494164b4 github.com/oschwald/geoip2-golang v1.4.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 ) diff --git a/ClashX/goClash/go.sum b/ClashX/goClash/go.sum index 34a0e90..380cf72 100644 --- a/ClashX/goClash/go.sum +++ b/ClashX/goClash/go.sum @@ -1,5 +1,5 @@ -github.com/Dreamacro/clash v1.3.1-0.20201124145223-0d33dc3eb9bc h1:OHbKPYyMG9hXwCTO3g6CvRd0DDArAAWeZpMjJpLBx1w= -github.com/Dreamacro/clash v1.3.1-0.20201124145223-0d33dc3eb9bc/go.mod h1:jpzNkbLW28q7hRJ8wu54swTv9ppg4czKqdDo1R15LPo= +github.com/Dreamacro/clash v1.3.1-0.20201217141727-4b1b494164b4 h1:YPnH4YAPVm2sgm13XT9EkVP40vTuwvBDnSDmb/r4eoA= +github.com/Dreamacro/clash v1.3.1-0.20201217141727-4b1b494164b4/go.mod h1:jpzNkbLW28q7hRJ8wu54swTv9ppg4czKqdDo1R15LPo= github.com/Dreamacro/go-shadowsocks2 v0.1.6 h1:PysSf9sLT3Qn8jhlin5v7Rk68gOQG4K5BZFY1nxLGxI= github.com/Dreamacro/go-shadowsocks2 v0.1.6/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/ClashX/goClash/upgrade_core.py b/ClashX/goClash/upgrade_core.py index 35273f3..e126b8e 100644 --- a/ClashX/goClash/upgrade_core.py +++ b/ClashX/goClash/upgrade_core.py @@ -1,7 +1,7 @@ import subprocess import os import re -from build_clash import get_version +from build_clash import get_full_version from build_clash import build_clash @@ -19,10 +19,10 @@ def install(): if __name__ == '__main__': print("start") - current = get_version() + current = get_full_version() print("current version:", current) upgrade_version(current) install() - new_version = get_version() + new_version = get_full_version() print("new version:", new_version, ",start building") build_clash(new_version) diff --git a/dist.p12.enc b/dist.p12.enc deleted file mode 100644 index cbe2b79380f61950a63360e359d5dd70bf3b8b5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3360 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