Skip to content

Commit f28afcb

Browse files
committed
Build macOS libraries via pre-built libraries
1 parent 01aaffb commit f28afcb

File tree

8 files changed

+100
-576
lines changed

8 files changed

+100
-576
lines changed

.github/workflows/ci-build-release-wheels.yaml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -112,30 +112,8 @@ jobs:
112112
- name: checkout
113113
uses: actions/checkout@v3
114114

115-
- name: Dependencies cache
116-
uses: actions/cache@v3
117-
id: cache-deps
118-
with:
119-
path: .pulsar-mac-build/deps/install
120-
key: ${{matrix.py.version_long}}-${{ hashFiles('dependencies.yaml') }}-${{ hashFiles('pkg/mac/*') }}
121-
122-
- name: Build dependencies
123-
if: steps.cache-deps.outputs.cache-hit != 'true'
124-
run: pkg/mac/build-dependencies.sh ${{matrix.py.version}} ${{matrix.py.version_long}}
125-
126-
- name: Pulsar C++ cache
127-
uses: actions/cache@v3
128-
id: cache-cpp
129-
with:
130-
path: .pulsar-mac-build/cpp/install
131-
key: ${{ hashFiles('dependencies.yaml') }}-${{ hashFiles('pulsar-client-cpp-version.txt') }}-${{ hashFiles('pkg/mac/*') }}
132-
133-
- name: Build Pulsar C++ client
134-
if: steps.cache-cpp.outputs.cache-hit != 'true'
135-
run: pkg/mac/build-pulsar-cpp.sh
136-
137115
- name: Build and test Mac wheels
138-
run: pkg/mac/build-mac-wheels.sh ${{matrix.py.version}}
116+
run: pkg/mac/build-mac-wheels.sh ${{matrix.py.version}} ${{matrix.py.version_long}}
139117

140118
- name: Upload artifacts
141119
uses: actions/upload-artifact@v3

.github/workflows/ci-pr-validation.yaml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -169,38 +169,10 @@ jobs:
169169
- name: checkout
170170
uses: actions/checkout@v3
171171

172-
- name: Dependencies cache
173-
uses: actions/cache@v3
174-
id: cache-deps
175-
with:
176-
path: .pulsar-mac-build/deps/install
177-
key: ${{matrix.py.version_long}}-${{ hashFiles('dependencies.yaml') }}-${{ hashFiles('pkg/mac/*') }}
178-
179-
- name: Build dependencies
180-
if: steps.cache-deps.outputs.cache-hit != 'true'
181-
run: |
182-
python3 -m venv venv
183-
source venv/bin/activate
184-
python3 -m pip install pyyaml setuptools
185-
pkg/mac/build-dependencies.sh ${{matrix.py.version}} ${{matrix.py.version_long}}
186-
187-
- name: Pulsar C++ cache
188-
uses: actions/cache@v3
189-
id: cache-cpp
190-
with:
191-
path: .pulsar-mac-build/cpp/install
192-
key: ${{ hashFiles('dependencies.yaml') }}-${{ hashFiles('pulsar-client-cpp-version.txt') }}-${{ hashFiles('pkg/mac/*') }}
193-
194-
- name: Build Pulsar C++ client
195-
if: steps.cache-cpp.outputs.cache-hit != 'true'
196-
run: |
197-
source venv/bin/activate
198-
pkg/mac/build-pulsar-cpp.sh
199-
200172
- name: Build and test Mac wheels
201173
run: |
202174
source venv/bin/activate
203-
pkg/mac/build-mac-wheels.sh ${{matrix.py.version}}
175+
pkg/mac/build-mac-wheels.sh ${{matrix.py.version}} ${{matrix.py.version_long}}
204176
205177
windows-wheels:
206178
name: "Python ${{ matrix.python.version }} Wheel on Windows x64"

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ vcpkg_installed/
2222
lib_pulsar.so
2323
tests/test.log
2424
.tests-container-id.txt
25-
25+
include/
26+
lib/

pkg/mac/build-dependencies.sh

Lines changed: 0 additions & 220 deletions
This file was deleted.

0 commit comments

Comments
 (0)