Merge remote-tracking branch 'origin/main' into korniltsev/switch-run…

…ners
grafana · Nov 21, 2024 · cb03490 · cb03490
2 parents 58f9656 + 0837606
commit cb03490
Show file tree

Hide file tree

Showing 17 changed files with 300 additions and 249 deletions.
diff --git a/.github/workflows/ci-ffi-python.yml b/.github/workflows/ci-ffi-python.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Build in Docker
         run: make wheel/linux/amd64
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "linux.whl"
           path: pyroscope_ffi/python/dist/*
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        PYTHON_VERSION: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     needs: [ 'linux-build' ]
     name: Linux Test
     runs-on: ubuntu-latest
@@ -60,7 +60,7 @@ jobs:
       - name: Build in Docker
         run: make wheel/linux/arm64
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "linux-arm.whl"
           path: pyroscope_ffi/python/dist/*
@@ -81,7 +81,7 @@ jobs:
         run: python setup.py sdist
         working-directory: pyroscope_ffi/python
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "sdist.whl"
           path: pyroscope_ffi/python/dist/*
@@ -117,7 +117,7 @@ jobs:
           python-version: 3.11
 
       - run: make wheel/mac/${{ matrix.mk-arch }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/python/dist/*
diff --git a/.github/workflows/ci-ffi-ruby.yml b/.github/workflows/ci-ffi-ruby.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
       - run: make gem/linux/amd64
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: "linux.gem"
           path: pyroscope_ffi/ruby/pkg/*.gem
@@ -48,7 +48,7 @@ jobs:
           profile: minimal
           override: true
       - run: make gem/mac/${{ matrix.mk-arch }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/ruby/pkg/*.gem

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -130,7 +130,7 @@ jobs:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
       - run: make wheel/linux/amd64
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/python/dist/*
@@ -150,7 +150,7 @@ jobs:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
       - run: make wheel/linux/arm64
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/python/dist/*
@@ -196,7 +196,7 @@ jobs:
 
       - run: make pyroscope_ffi/clean wheel/mac/${{ matrix.mk-arch }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/python/dist/*
@@ -227,7 +227,7 @@ jobs:
         run: python setup.py sdist
         working-directory: pyroscope_ffi/python
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/python/dist/*
@@ -263,7 +263,7 @@ jobs:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
       - run: make gem/linux/amd64
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/ruby/pkg/*.gem
@@ -283,7 +283,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: make gem/linux/arm64
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/ruby/pkg/*.gem
@@ -326,7 +326,7 @@ jobs:
 
       - run: make pyroscope_ffi/clean gem/mac/${{ matrix.mk-arch }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/ruby/pkg/*.gem
@@ -360,7 +360,7 @@ jobs:
         run: rake source:gem
         working-directory: pyroscope_ffi/ruby
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
           path: pyroscope_ffi/ruby/pkg/*.gem

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @grafana/pyroscope-rs
+* @grafana/pyroscope-rs @grafana/pyroscope-team
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @grafana/pyroscope-rs
		* @grafana/pyroscope-rs @grafana/pyroscope-team