Skip to content

Commit e218b12

Browse files
kwongtnkwongtn
authored
Fix GitHub actions (#187)
Signed-off-by: Kwong Tung Nan <[email protected]>
1 parent b9c80d8 commit e218b12

File tree

13 files changed

+125
-131
lines changed

13 files changed

+125
-131
lines changed

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

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Python Package
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches:
66
pull_request:
77
branches: [ main ]
88

@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest # TODO try using grafana runners
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Build in Docker
1717
run: make wheel/linux/amd64
1818

@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
PYTHON_VERSION: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
28+
PYTHON_VERSION: [ '3.9', '3.10', '3.11', '3.12', '3.13']
2929
needs: [ 'linux-build' ]
3030
name: Linux Test
3131
runs-on: ubuntu-latest
@@ -36,18 +36,18 @@ jobs:
3636
PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
3737
steps:
3838
- name: Set up Python
39-
uses: actions/setup-python@v4
39+
uses: actions/setup-python@v5
4040
with:
4141
python-version: ${{ matrix.PYTHON_VERSION }}
4242
architecture: x64
43-
- uses: actions/download-artifact@v2
43+
- uses: actions/download-artifact@v4
4444
with:
4545
name: "linux.whl"
4646
path: "${{github.workspace}}/python"
4747

4848
- run: "cd ${{ github.workspace }}/python && ls -l"
4949
- run: "cd ${{ github.workspace }}/python && pip install *.whl"
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151
- run: docker run -d -p4040:4040 grafana/pyroscope
5252
- run: python pyroscope_ffi/python/scripts/tests/test.py
5353

@@ -56,7 +56,7 @@ jobs:
5656
runs-on: github-hosted-ubuntu-arm64
5757
steps:
5858
- uses: AutoModality/action-clean@v1
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- name: Build in Docker
6161
run: make wheel/linux/arm64
6262

@@ -70,8 +70,8 @@ jobs:
7070
runs-on: ubuntu-latest
7171

7272
steps:
73-
- uses: actions/checkout@v3
74-
- uses: actions/setup-python@v4
73+
- uses: actions/checkout@v4
74+
- uses: actions/setup-python@v5
7575
with:
7676
python-version: 3.9
7777
- name: Upgrade pip
@@ -91,33 +91,29 @@ jobs:
9191
fail-fast: false
9292
matrix:
9393
include:
94-
- macos-version: "11.0"
94+
- macos-version: "14"
9595
target: x86_64-apple-darwin
96-
py-platform: macosx-11_0_x86_64
9796
mk-arch: amd64
98-
- macos-version: "11.0"
97+
- macos-version: "14"
9998
target: aarch64-apple-darwin
100-
py-platform: macosx-11_0_arm64
10199
mk-arch: arm64
102100

103-
name: macOS - ${{ matrix.py-platform }}
101+
name: macOS - ${{ matrix.target }}
104102
runs-on: macos-${{ matrix.macos-version }}
105103

106104
steps:
107-
- uses: actions/checkout@v3
108-
- uses: actions-rs/toolchain@v1
105+
- uses: actions/checkout@v4
106+
- uses: dtolnay/rust-toolchain@v1
109107
with:
110-
toolchain: 1.76.0
111-
target: ${{ matrix.target }}
112-
profile: minimal
113-
override: true
108+
toolchain: 1.82.0
109+
targets: ${{ matrix.target }}
114110

115-
- uses: actions/setup-python@v4
111+
- uses: actions/setup-python@v5
116112
with:
117113
python-version: 3.11
118114

119115
- run: make wheel/mac/${{ matrix.mk-arch }}
120116
- uses: actions/upload-artifact@v4
121117
with:
122-
name: ${{ github.sha }}
118+
name: ${{ github.sha }}-python-${{ matrix.target }}
123119
path: pyroscope_ffi/python/dist/*

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Ruby Package
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
66
pull_request:
77
branches: [main]
88

@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- uses: AutoModality/action-clean@v1
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- run: make gem/linux/amd64
1818
- uses: actions/upload-artifact@v4
1919
with:
@@ -24,33 +24,32 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
- macos-version: "11.0"
27+
- macos-version: "14"
2828
target: x86_64-apple-darwin
2929
mk-arch: amd64
30-
- macos-version: "11.0"
30+
- macos-version: "14"
3131
target: aarch64-apple-darwin
3232
mk-arch: arm64
33+
3334
name: macOS - ${{ matrix.target }}
3435
runs-on: macos-${{ matrix.macos-version }}
3536

3637
env:
3738
RUST_TARGET: ${{ matrix.target }}
3839

3940
steps:
40-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4142
- uses: ruby/setup-ruby@v1
4243
with:
4344
ruby-version: '3.1'
44-
- uses: actions-rs/toolchain@v1
45+
- uses: dtolnay/rust-toolchain@v1
4546
with:
46-
toolchain: 1.76.0
47-
target: ${{ matrix.target }}
48-
profile: minimal
49-
override: true
47+
toolchain: 1.82.0
48+
targets: ${{ matrix.target }}
5049
- run: make gem/mac/${{ matrix.mk-arch }}
5150
- uses: actions/upload-artifact@v4
5251
with:
53-
name: ${{ github.sha }}
52+
name: ${{ github.sha }}-ruby-${{ matrix.target }}
5453
path: pyroscope_ffi/ruby/pkg/*.gem
5554

5655
linux-test:
@@ -59,21 +58,21 @@ jobs:
5958
matrix:
6059
PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
6160
PYROSCOPE_ONCPU: [1, 0]
62-
RUBY_VERSION: ['2.6', '2.7', '3.0', '3.1', '3.2']
61+
RUBY_VERSION: ['3.1', '3.2', '3.3']
6362
needs: ['linux-build']
6463
name: Linux Test
6564
runs-on: ubuntu-latest
6665
steps:
6766
- uses: ruby/setup-ruby@v1
6867
with:
6968
ruby-version: ${{ matrix.RUBY_VERSION }}
70-
- uses: actions/download-artifact@v2
69+
- uses: actions/download-artifact@v4
7170
with:
7271
name: "linux.gem"
7372
path: "${{github.workspace}}/ruby"
7473
- run: "cd ${{ github.workspace }}/ruby && ls -l"
7574
- run: "cd ${{ github.workspace }}/ruby && gem install *.gem"
76-
- uses: actions/checkout@v3
75+
- uses: actions/checkout@v4
7776
- name: Run Ruby Script
7877
run: pyroscope_ffi/ruby/scripts/tests/test.rb
7978
env:

‎.github/workflows/publish.yml‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: "startsWith(github.event.release.tag_name, 'lib-')"
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions-rs/toolchain@v1
14+
- uses: actions/checkout@v4
15+
- uses: dtolnay/rust-toolchain@v1
1616
with:
17-
toolchain: stable
18-
override: true
17+
toolchain: 1.82.0
1918
- name: publish pyroscope crate
2019
continue-on-error: true
2120
run: |
@@ -26,13 +25,12 @@ jobs:
2625
# runs-on: ubuntu-latest
2726
# if: "startsWith(github.event.release.tag_name, 'cli-')"
2827
# steps:
29-
# - uses: actions/checkout@v3
28+
# - uses: actions/checkout@v4
3029
# with:
3130
# submodules: recursive
32-
# - uses: actions-rs/toolchain@v1
31+
# - uses: dtolnay/rust-toolchain@v1
3332
# with:
34-
# toolchain: stable
35-
# override: true
33+
# toolchain: 1.82.0
3634
# - name: install libunwind (for pprof)
3735
# run: sudo apt install libunwind8-dev
3836
# - name: publish pyroscope crate
@@ -45,11 +43,10 @@ jobs:
4543
runs-on: ubuntu-latest
4644
if: "startsWith(github.event.release.tag_name, 'pprofrs-')"
4745
steps:
48-
- uses: actions/checkout@v3
49-
- uses: actions-rs/toolchain@v1
46+
- uses: actions/checkout@v4
47+
- uses: dtolnay/rust-toolchain@v1
5048
with:
51-
toolchain: stable
52-
override: true
49+
toolchain: 1.82.0
5350
- name: publish pprofrs crate
5451
continue-on-error: true
5552
run: |
@@ -60,11 +57,10 @@ jobs:
6057
runs-on: ubuntu-latest
6158
if: "startsWith(github.event.release.tag_name, 'rbspy-')"
6259
steps:
63-
- uses: actions/checkout@v3
64-
- uses: actions-rs/toolchain@v1
60+
- uses: actions/checkout@v4
61+
- uses: dtolnay/rust-toolchain@v1
6562
with:
66-
toolchain: stable
67-
override: true
63+
toolchain: 1.82.0
6864
- name: publish rbspy crate
6965
continue-on-error: true
7066
run: |
@@ -75,11 +71,10 @@ jobs:
7571
runs-on: ubuntu-latest
7672
if: "startsWith(github.event.release.tag_name, 'pyspy-')"
7773
steps:
78-
- uses: actions/checkout@v3
79-
- uses: actions-rs/toolchain@v1
74+
- uses: actions/checkout@v4
75+
- uses: dtolnay/rust-toolchain@v1
8076
with:
81-
toolchain: stable
82-
override: true
77+
toolchain: 1.82.0
8378
- name: publish pyspy crate
8479
continue-on-error: true
8580
run: |
@@ -90,7 +85,7 @@ jobs:
9085
runs-on: ubuntu-latest
9186
if: "startsWith(github.event.release.tag_name, 'python-')"
9287
steps:
93-
- uses: robinraju/release-downloader@v1.4
88+
- uses: robinraju/release-downloader@v1
9489
with:
9590
tag: ${{ github.event.release.tag_name }}
9691
fileName: "*"
@@ -99,7 +94,7 @@ jobs:
9994
out-file-path: "dist"
10095
token: ${{ secrets.GITHUB_TOKEN }}
10196
- name: Publish a Python distribution to PyPI
102-
uses: pypa/gh-action-pypi-publish@release/v1
97+
uses: pypa/gh-action-pypi-publish@v1.12.2
10398
with:
10499
user: __token__
105100
password: ${{ secrets.PYPI_API_TOKEN }}
@@ -110,7 +105,7 @@ jobs:
110105
outputs:
111106
files_json: ${{ steps.list-files.outputs.files_json }}
112107
steps:
113-
- uses: robinraju/release-downloader@v1.4
108+
- uses: robinraju/release-downloader@v1
114109
with:
115110
tag: ${{ github.event.release.tag_name }}
116111
fileName: "*"
@@ -138,7 +133,7 @@ jobs:
138133
- uses: ruby/setup-ruby@v1
139134
with:
140135
ruby-version: '3.1'
141-
- uses: robinraju/release-downloader@v1.4
136+
- uses: robinraju/release-downloader@v1
142137
with:
143138
tag: ${{ github.event.release.tag_name }}
144139
fileName: "*"

0 commit comments

Comments
 (0)