Skip to content

Commit 807abee

Browse files
authored
Remove libprotobuf dep (#1249)
1 parent 4f34d5f commit 807abee

23 files changed

Lines changed: 666 additions & 831 deletions

.github/workflows/release.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ jobs:
2626
target: [x86_64, aarch64]
2727
steps:
2828
- uses: actions/checkout@v3
29-
- name: Install Protoc
30-
uses: arduino/setup-protoc@v1
31-
if: matrix.target == 'aarch64'
32-
with:
33-
version: '3.x'
34-
repo-token: ${{ secrets.GITHUB_TOKEN }}
3529
- uses: actions/setup-python@v4
3630
with:
3731
python-version: '3.10'
@@ -43,11 +37,6 @@ jobs:
4337
args: --release --out dist
4438
sccache: 'true'
4539
manylinux: '2_17'
46-
before-script-linux: >
47-
DOWNLOAD_URL=$(curl --retry 6 --retry-delay 10 -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep -o '"browser_download_url": "[^"]*' | cut -d'"' -f4 | grep "\linux-x86_64.zip$") &&
48-
curl --retry 6 --retry-delay 10 -LO $DOWNLOAD_URL &&
49-
unzip protoc-*-linux-x86_64.zip -d $HOME/.local
50-
docker-options: --env PROTOC=/root/.local/bin/protoc
5140
- name: Build wheels for aarch64
5241
if: matrix.target == 'aarch64'
5342
uses: PyO3/maturin-action@v1
@@ -79,11 +68,6 @@ jobs:
7968
runs-on: windows-latest
8069
steps:
8170
- uses: actions/checkout@v3
82-
- name: Install Protoc
83-
uses: arduino/setup-protoc@v1
84-
with:
85-
version: '3.x'
86-
repo-token: ${{ secrets.GITHUB_TOKEN }}
8771
- uses: actions/setup-python@v4
8872
with:
8973
python-version: '3.10'
@@ -121,11 +105,6 @@ jobs:
121105
target: [x86_64, aarch64]
122106
steps:
123107
- uses: actions/checkout@v3
124-
- name: Install Protoc
125-
uses: arduino/setup-protoc@v1
126-
with:
127-
version: '3.x'
128-
repo-token: ${{ secrets.GITHUB_TOKEN }}
129108
- uses: actions/setup-python@v4
130109
with:
131110
python-version: '3.10'

.github/workflows/rust.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ jobs:
3030
id: detect-trigger
3131
with:
3232
keyword: "[test-df-upstream]"
33-
- name: Install Protoc
34-
uses: arduino/setup-protoc@v1
35-
with:
36-
version: '3.x'
37-
repo-token: ${{ secrets.GITHUB_TOKEN }}
3833

3934
# Check crate compiles
4035
linux-build-lib:
@@ -52,11 +47,6 @@ jobs:
5247
if: needs.detect-ci-trigger.outputs.triggered == 'true'
5348
run: |
5449
bash continuous_integration/scripts/update-dependencies.sh
55-
- name: Install Protoc
56-
uses: arduino/setup-protoc@v1
57-
with:
58-
version: '3.x'
59-
repo-token: ${{ secrets.GITHUB_TOKEN }}
6050
- name: Check workspace in debug mode
6151
run: |
6252
cargo check
@@ -82,11 +72,6 @@ jobs:
8272
if: needs.detect-ci-trigger.outputs.triggered == 'true'
8373
run: |
8474
bash continuous_integration/scripts/update-dependencies.sh
85-
- name: Install Protoc
86-
uses: arduino/setup-protoc@v1
87-
with:
88-
version: '3.x'
89-
repo-token: ${{ secrets.GITHUB_TOKEN }}
9075
- name: Run tests
9176
run: |
9277
cargo test

.github/workflows/style.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717
- uses: actions/setup-python@v4
18-
- name: Install Protoc
19-
uses: arduino/setup-protoc@v1
20-
with:
21-
version: '3.x'
22-
repo-token: ${{ secrets.GITHUB_TOKEN }}
2318
- uses: actions-rs/toolchain@v1
2419
with:
2520
toolchain: nightly

.github/workflows/test-upstream.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@ jobs:
113113
# https://github.com/dask-contrib/dask-sql/pull/1143
114114
python-version: "3.9"
115115
channel-priority: strict
116-
- name: Install Protoc
117-
uses: arduino/setup-protoc@v1
118-
with:
119-
version: '3.x'
120-
repo-token: ${{ secrets.GITHUB_TOKEN }}
121116
- name: Optionally update upstream cargo dependencies
122117
if: env.which_upstream == 'DataFusion'
123118
env:

.github/workflows/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ jobs:
111111
# https://github.com/dask-contrib/dask-sql/pull/1143
112112
python-version: ${{ needs.detect-ci-trigger.outputs.triggered == 'true' && '3.9' || '3.8' }}
113113
channel-priority: strict
114-
- name: Install Protoc
115-
uses: arduino/setup-protoc@v1
116-
with:
117-
version: '3.x'
118-
repo-token: ${{ secrets.GITHUB_TOKEN }}
119114
- name: Install dependencies and nothing else
120115
run: |
121116
pip install -e . -vv

0 commit comments

Comments
 (0)