Skip to content

Commit

Permalink
fix(cli): exec command args (#130)
Browse files Browse the repository at this point in the history
- 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'
  • Loading branch information
korniltsev authored Aug 7, 2023
1 parent 32df0c8 commit ad88f50
Show file tree
Hide file tree
Showing 31 changed files with 227 additions and 287 deletions.
6 changes: 3 additions & 3 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ steps:
- commands:
- uname -a
- make test
image: pyroscope/rust_builder_cli:1
image: pyroscope/rust_builder_cli:2
name: make cli/test
trigger:
event:
Expand All @@ -24,14 +24,14 @@ steps:
- commands:
- uname -a
- make test
image: pyroscope/rust_builder_cli:1
image: pyroscope/rust_builder_cli:2
name: make cli/test
trigger:
event:
- pull_request
type: docker
---
kind: signature
hmac: afb4cb757c4a553f765b97688bd67b2fe94528e404540d2cbd3c0683e4e0b0a0
hmac: ae54e4e9f852f94f3f7cd411812430ea96ad7238f1f638753161305d554e55fa

...
2 changes: 2 additions & 0 deletions .drone/pipelines/test.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ local pipelines = import '../util/pipelines.jsonnet';
pipelines.linux_amd64('[amd64] make test') {
trigger: {
event: ['pull_request'],
//ref: ['refs/heads/main'],
},
steps: [
{
Expand All @@ -18,6 +19,7 @@ local pipelines = import '../util/pipelines.jsonnet';
pipelines.linux_arm64('[arm64] make test') {
trigger: {
event: ['pull_request'],
//ref: ['refs/heads/main'],
},
steps: [
{
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/ci-ffi-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
build-arch:
- manylinux2010_x86_64
- manylinux2014_x86_64

name: Linux - ${{ matrix.build-arch }}
runs-on: ubuntu-latest
Expand All @@ -23,11 +23,6 @@ jobs:
with:
submodules: recursive

- if: matrix.build-arch == 'manylinux2014_aarch64'
uses: docker/setup-qemu-action@v1
with:
platforms: arm64

- name: Build in Docker
run: pyroscope_ffi/python/scripts/docker.sh
env:
Expand Down Expand Up @@ -84,7 +79,6 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Build in Docker
run: pyroscope_ffi/python/scripts/docker.sh
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-ffi-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
working-directory: pyroscope_ffi/ruby

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

- name: Copy generated extra libraries
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
Expand Down
40 changes: 33 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,37 @@ jobs:
title: "pyroscope-${{ github.ref_name }}"
draft: true
prerelease: false
clibuilder-release:
name: clibuilder-release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/clibuilder-')"
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: docker/login-action@v2
name: Login to Docker Hub
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- run: docker buildx create --use
- run: make -C docker push_cli_builder
manylinux-release:
name: manylinux-release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/manylinux-')"
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: docker/login-action@v2
name: Login to Docker Hub
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- run: docker buildx create --use
- run: make -C docker push_aarch64 push_x86_64

cli-release:
name: pyroscope-cli
runs-on: ubuntu-latest
Expand Down Expand Up @@ -101,7 +132,7 @@ jobs:
fail-fast: false
matrix:
build-arch:
- manylinux2010_x86_64
- manylinux2014_x86_64

name: Linux - ${{ matrix.build-arch }}
runs-on: ubuntu-latest
Expand All @@ -112,11 +143,6 @@ jobs:
with:
submodules: recursive

- if: matrix.build-arch == 'manylinux2014_aarch64'
uses: docker/setup-qemu-action@v1
with:
platforms: arm64

- name: Build in Docker
run: pyroscope_ffi/python/scripts/docker.sh
env:
Expand Down Expand Up @@ -297,7 +323,7 @@ jobs:
working-directory: pyroscope_ffi/ruby

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

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

0 comments on commit ad88f50

Please sign in to comment.