From bec14bf7dbc6c1d4118fef74c6fdacb2bec03257 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 28 Mar 2023 19:37:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=BD=91=E7=BB=9C=E8=BF=9E=E9=80=9A=E6=80=A7=E5=88=A4?= =?UTF-8?q?=E6=96=AD=20URL=20https://github.com/siyuan-note/siyuan/issues/?= =?UTF-8?q?7805?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/electron/main.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/electron/main.js b/app/electron/main.js index 0b2257891..2e4b1b252 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -954,7 +954,12 @@ powerMonitor.on("resume", async () => { const result = await fetch("https://icanhazip.com", {timeout: 1000}); return 200 === result.status; } catch (e) { - return false; + try { + const result = await fetch("https://api.ipify.org", {timeout: 1000}); + return 200 === result.status; + } catch (e) { + return false; + } } } }; From 0d711703317df92490399e67c156afe2405a445c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 28 Mar 2023 19:40:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:bug:=20Windows=20=E7=AB=AF=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=B3=BB=E7=BB=9F=E4=B8=8A=E5=86=85=E6=A0=B8=E5=B4=A9?= =?UTF-8?q?=E6=BA=83=20https://github.com/siyuan-note/siyuan/issues/7806?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/util/runtime.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/util/runtime.go b/kernel/util/runtime.go index 31c605435..596bf6810 100644 --- a/kernel/util/runtime.go +++ b/kernel/util/runtime.go @@ -313,8 +313,6 @@ func existAvailabilityStatus(workspaceAbsPath string) bool { return false } - logging.LogInfof("check workspace [%s] availability status", checkAbsPath) - runtime.LockOSThread() defer runtime.LockOSThread() if err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED); nil != err { From 3b6afae6c61c83563a26da7d430c03e82b54208e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9B=E4=BA=BD?= <83791825+Soltus@users.noreply.github.com> Date: Wed, 29 Mar 2023 08:44:33 +0800 Subject: [PATCH 3/3] Enhance ci workflow (#7807) * Update parse-changelog.py * Update ci.yml * Update ci.yml * Update parse-changelog.py --- .github/workflows/ci.yml | 13 +++++++++++-- scripts/parse-changelog.py | 21 +++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 249f8b993..1c7acdfa4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,22 @@ jobs: with: python-version: "3.10" - run: pip install PyGithub + + - id: thislatestR + uses: pozetroninc/github-action-get-latest-release@master + with: + # owner: siyuan-note + # repo: siyuan + repository: ${{ github.repository }} + token: ${{ secrets.GITHUB_TOKEN }} + excludes: prerelease, draft - name: Gather Release Information id: release_info run: | echo "release_title=$(git show --format=%s --no-patch | head -1)" >> $GITHUB_OUTPUT echo "release_version=$(TZ=Asia/Shanghai date +'v%Y%m%d%H%M')" >> $GITHUB_OUTPUT - changelog=$(python scripts/parse-changelog.py -t ${{ github.ref }} siyuan-note/siyuan) + changelog=$(python scripts/parse-changelog.py -t ${{ github.ref }} -b ${{ steps.thislatestR.outputs.release }} siyuan-note/siyuan) EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) echo "release_body<<$EOF" >> $GITHUB_ENV echo "$changelog" >> $GITHUB_ENV @@ -143,7 +152,7 @@ jobs: working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - name: Install Node Dependencies - run: pnpm install + run: pnpm install --no-frozen-lockfile working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - name: Building UI diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py index 49cee8240..65965a81a 100644 --- a/scripts/parse-changelog.py +++ b/scripts/parse-changelog.py @@ -16,7 +16,7 @@ docmap = { } -def generate_msg_from_repo(repo_name, tag_name): +def generate_msg_from_repo(repo_name, tag_name, lastestRelease): """Generate changelog messages from repository and tag name. Envs: @@ -33,7 +33,7 @@ def generate_msg_from_repo(repo_name, tag_name): gh = github.Github(token, base_url=f"https://{hostname}") repo = gh.get_repo(repo_name) - milestone = find_milestone(repo, tag_name) + milestone = find_milestone(repo, tag_name, lastestRelease) for issue in repo.get_issues(state="closed", milestone=milestone): # REF https://pygithub.readthedocs.io/en/latest/github_objects/Issue.html#github.Issue.Issue @@ -43,7 +43,7 @@ def generate_msg_from_repo(repo_name, tag_name): generate_msg(desc_mapping) -def find_milestone(repo, title): +def find_milestone(repo, title, lastestRelease): """Find the milestone in a repository that is similar to milestone title Args: @@ -55,9 +55,21 @@ def find_milestone(repo, title): If no milestone matches, it will return None """ pat = re.search("v([0-9.]+)", title) + thisRelease = title.split("/")[-1] if not pat: return None version = pat.group(1) + print(f''' +--- +

+ + +GitHub commits difference between two branches/tags/commits +

+ +--- + +''') for milestone in repo.get_milestones(): if version in milestone.title: return milestone @@ -88,10 +100,11 @@ if __name__ == "__main__": description="Automaticly generate information from issues by tag." ) parser.add_argument("-t", "--tag", help="the tag to filter issues.") + parser.add_argument("-b", "--lastestRelease", help="lastest Release") parser.add_argument("repo", help="The repository name") args = parser.parse_args() try: - generate_msg_from_repo(args.repo, args.tag) + generate_msg_from_repo(args.repo, args.tag, args.lastestRelease) except AssertionError: print(args.tag)