Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: package script on ubuntu1804 #697

Merged
merged 9 commits into from
Mar 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/ci-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rdsn
Submodule rdsn updated 114 files
6 changes: 3 additions & 3 deletions scripts/pack_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/server/config.min.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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@

Expand Down