You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by zh...@apache.org on 2021/03/18 03:09:26 UTC
[incubator-pegasus] branch master updated: fix: package script on
ubuntu1804 (#697)
This is an automated email from the ASF dual-hosted git repository.
zhaoliwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new c464cc1 fix: package script on ubuntu1804 (#697)
c464cc1 is described below
commit c464cc188f6e5db58a03a06b959a283374ad2d83
Author: Wu Tao <wu...@163.com>
AuthorDate: Wed Mar 17 22:09:19 2021 -0500
fix: package script on ubuntu1804 (#697)
---
.github/workflows/ci-pull-request.yaml | 12 +++---------
rdsn | 2 +-
scripts/pack_server.sh | 6 +++---
src/server/config.min.ini | 2 +-
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml
index e6e3109..5bc0d5d 100644
--- a/.github/workflows/ci-pull-request.yaml
+++ b/.github/workflows/ci-pull-request.yaml
@@ -14,10 +14,6 @@ on:
- master
- 'v[0-9]+.*' # release branch
- ci-test # testing branch for github action
- paths:
- - 'rdsn/**'
- - 'src/**'
- - '.github/workflows/ci-pull-request.yaml'
# for manually triggering workflow
workflow_dispatch:
@@ -50,13 +46,11 @@ jobs:
image: ghcr.io/pegasus-kv/thirdparties-bin:ubuntu1804
defaults:
run:
- working-directory: /root/incubator-pegasus
shell: bash
steps:
- - name: Clone Apache Pegasus Source
- working-directory: /root
- run: |
- git clone --recursive --depth=1 https://github.com/apache/incubator-pegasus.git
+ - uses: actions/checkout@v2
+ with:
+ submodules: recursive
- name: Unpack prebuilt third-parties
run: unzip /root/thirdparties-bin.zip -d ./rdsn/thirdparty
- name: Compilation
diff --git a/rdsn b/rdsn
index c057d35..e2bf7c7 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit c057d35c93ff9d895d5eefef343b6c7afd74812d
+Subproject commit e2bf7c740b93cc4a59769b6dc888609f36871b67
diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh
index ff97858..e6126c2 100755
--- a/scripts/pack_server.sh
+++ b/scripts/pack_server.sh
@@ -160,9 +160,9 @@ DISTRIB_ID=$(cat /etc/*-release | grep DISTRIB_ID | awk -F'=' '{print $2}')
DISTRIB_RELEASE=$(cat /etc/*-release | grep DISTRIB_RELEASE | awk -F'=' '{print $2}')
if [ -n "$DISTRIB_ID" ] && [ -n "$DISTRIB_RELEASE" ]; then
if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$DISTRIB_RELEASE" == "18.04" ]; then
- pack_system_lib icui18n
- pack_system_lib icuuc
- pack_system_lib icudata
+ pack_server_lib icui18n
+ pack_server_lib icuuc
+ pack_server_lib icudata
fi
# more cases can be added here.
fi
diff --git a/src/server/config.min.ini b/src/server/config.min.ini
index 5b9a7b1..d7bd908 100644
--- a/src/server/config.min.ini
+++ b/src/server/config.min.ini
@@ -131,7 +131,7 @@
# Options:
# - falcon
# - prometheus
- perf_counter_sink = prometheus
+ perf_counter_sink =
# The HTTP port exposed to Prometheus for pulling metrics from pegasus server.
prometheus_port = @PROMETHEUS_PORT@
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org