Skip to content

Commit ad88f50

Browse files
authored
fix(cli): exec command args (#130)
- fixes the bug with arguments - make pyroscope-cli wait for child exit then stop profiler then exit - update rust toolchain to 1.64 - make default log-level 'error'
1 parent 32df0c8 commit ad88f50

31 files changed

+227
-287
lines changed

.drone/drone.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- commands:
99
- uname -a
1010
- make test
11-
image: pyroscope/rust_builder_cli:1
11+
image: pyroscope/rust_builder_cli:2
1212
name: make cli/test
1313
trigger:
1414
event:
@@ -24,14 +24,14 @@ steps:
2424
- commands:
2525
- uname -a
2626
- make test
27-
image: pyroscope/rust_builder_cli:1
27+
image: pyroscope/rust_builder_cli:2
2828
name: make cli/test
2929
trigger:
3030
event:
3131
- pull_request
3232
type: docker
3333
---
3434
kind: signature
35-
hmac: afb4cb757c4a553f765b97688bd67b2fe94528e404540d2cbd3c0683e4e0b0a0
35+
hmac: ae54e4e9f852f94f3f7cd411812430ea96ad7238f1f638753161305d554e55fa
3636

3737
...

.drone/pipelines/test.jsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ local pipelines = import '../util/pipelines.jsonnet';
66
pipelines.linux_amd64('[amd64] make test') {
77
trigger: {
88
event: ['pull_request'],
9+
//ref: ['refs/heads/main'],
910
},
1011
steps: [
1112
{
@@ -18,6 +19,7 @@ local pipelines = import '../util/pipelines.jsonnet';
1819
pipelines.linux_arm64('[arm64] make test') {
1920
trigger: {
2021
event: ['pull_request'],
22+
//ref: ['refs/heads/main'],
2123
},
2224
steps: [
2325
{

.github/workflows/ci-ffi-python.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
build-arch:
15-
- manylinux2010_x86_64
15+
- manylinux2014_x86_64
1616

1717
name: Linux - ${{ matrix.build-arch }}
1818
runs-on: ubuntu-latest
@@ -23,11 +23,6 @@ jobs:
2323
with:
2424
submodules: recursive
2525

26-
- if: matrix.build-arch == 'manylinux2014_aarch64'
27-
uses: docker/setup-qemu-action@v1
28-
with:
29-
platforms: arm64
30-
3126
- name: Build in Docker
3227
run: pyroscope_ffi/python/scripts/docker.sh
3328
env:
@@ -84,7 +79,6 @@ jobs:
8479
- uses: actions/checkout@v3
8580
with:
8681
submodules: recursive
87-
8882
- name: Build in Docker
8983
run: pyroscope_ffi/python/scripts/docker.sh
9084
env:

.github/workflows/ci-ffi-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
working-directory: pyroscope_ffi/ruby
4646

4747
- name: Generate extra libraries
48-
run: BUILD_ARCH=manylinux2010_x86_64 ./pyroscope_ffi/ruby/scripts/docker.sh
48+
run: BUILD_ARCH=manylinux2014_x86_64 ./pyroscope_ffi/ruby/scripts/docker.sh
4949

5050
- name: Copy generated extra libraries
5151
run: mkdir -p lib/rbspy && cp ./elflib/rbspy/wheelhouse/rbspy-1.0.0/rbspy/_native__lib.cpython-37m-x86_64-linux-gnu.so lib/rbspy/rbspy.so

.github/workflows/release.yml

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,37 @@ jobs:
1616
title: "pyroscope-${{ github.ref_name }}"
1717
draft: true
1818
prerelease: false
19+
clibuilder-release:
20+
name: clibuilder-release
21+
runs-on: ubuntu-latest
22+
if: "startsWith(github.ref, 'refs/tags/clibuilder-')"
23+
steps:
24+
- uses: actions/checkout@v3
25+
with:
26+
submodules: recursive
27+
- uses: docker/login-action@v2
28+
name: Login to Docker Hub
29+
with:
30+
username: ${{ secrets.DOCKERHUB_USERNAME }}
31+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
32+
- run: docker buildx create --use
33+
- run: make -C docker push_cli_builder
34+
manylinux-release:
35+
name: manylinux-release
36+
runs-on: ubuntu-latest
37+
if: "startsWith(github.ref, 'refs/tags/manylinux-')"
38+
steps:
39+
- uses: actions/checkout@v3
40+
with:
41+
submodules: recursive
42+
- uses: docker/login-action@v2
43+
name: Login to Docker Hub
44+
with:
45+
username: ${{ secrets.DOCKERHUB_USERNAME }}
46+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
47+
- run: docker buildx create --use
48+
- run: make -C docker push_aarch64 push_x86_64
49+
1950
cli-release:
2051
name: pyroscope-cli
2152
runs-on: ubuntu-latest
@@ -101,7 +132,7 @@ jobs:
101132
fail-fast: false
102133
matrix:
103134
build-arch:
104-
- manylinux2010_x86_64
135+
- manylinux2014_x86_64
105136

106137
name: Linux - ${{ matrix.build-arch }}
107138
runs-on: ubuntu-latest
@@ -112,11 +143,6 @@ jobs:
112143
with:
113144
submodules: recursive
114145

115-
- if: matrix.build-arch == 'manylinux2014_aarch64'
116-
uses: docker/setup-qemu-action@v1
117-
with:
118-
platforms: arm64
119-
120146
- name: Build in Docker
121147
run: pyroscope_ffi/python/scripts/docker.sh
122148
env:
@@ -297,7 +323,7 @@ jobs:
297323
working-directory: pyroscope_ffi/ruby
298324

299325
- name: Generate extra libraries
300-
run: BUILD_ARCH=manylinux2010_x86_64 ./pyroscope_ffi/ruby/scripts/docker.sh
326+
run: BUILD_ARCH=manylinux2014_x86_64 ./pyroscope_ffi/ruby/scripts/docker.sh
301327

302328
- name: Copy generated extra libraries
303329
run: mkdir -p lib/thread_id && cp ext/thread_id/target/release/libthread_id.so lib/thread_id/thread_id.so

0 commit comments

Comments
 (0)