From 3fcbc9dc04af6b24a5a22eb4808c87e8fcf8174b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B5=AB=E7=84=B6?= Date: Wed, 18 Dec 2024 16:24:16 +0800 Subject: [PATCH 1/2] Update python to 3.12.8 for ci test --- .github/workflows/ci.yml | 2 +- ci/run.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97513dce..27b4ddb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fetch-depth: 1 - uses: actions/setup-python@v1 with: - python-version: "3.8" + python-version: "3.12.8" - name: install dependencies and test run: | cd $GITHUB_WORKSPACE diff --git a/ci/run.py b/ci/run.py index 48fed17e..579ec256 100755 --- a/ci/run.py +++ b/ci/run.py @@ -54,8 +54,8 @@ def _env_add(*a, **kw): _env_add('PATH', join(PREFIX, 'bin')) if on_github_actions(): - _env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.8.14/x64/lib/python3.8/site-packages')) - _env_add('PYTHONPATH', join(PREFIX, 'lib/python3.8/site-packages')) + _env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.8/x64/lib/python3.12/site-packages')) + _env_add('PYTHONPATH', join(PREFIX, 'lib/python3.12/site-packages')) _env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib', 'pkgconfig')) _env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib64', 'pkgconfig')) _env_add('PKG_CONFIG_PATH', libsearpc_dir) From 202dd20be0ce98a40ba861190900d0cac04ed615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B5=AB=E7=84=B6?= Date: Wed, 18 Dec 2024 16:42:01 +0800 Subject: [PATCH 2/2] Fix error for notification server --- notification-server/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notification-server/server.go b/notification-server/server.go index c6af3f8e..cf6a6fef 100644 --- a/notification-server/server.go +++ b/notification-server/server.go @@ -10,8 +10,8 @@ import ( "os" "os/signal" "path/filepath" - "strings" "strconv" + "strings" "syscall" "time" @@ -46,7 +46,7 @@ func init() { } func loadNotifConfig() { - host := os.Getenv("NOTIFICATION_SERVER_HOST") + host = os.Getenv("NOTIFICATION_SERVER_HOST") if host == "" { host = "0.0.0.0" } @@ -55,7 +55,7 @@ func loadNotifConfig() { if os.Getenv("NOTIFICATION_SERVER_PORT") != "" { i, err := strconv.Atoi(os.Getenv("NOTIFICATION_SERVER_PORT")) if err == nil { - port = i + port = uint32(i) } }