Skip to content

Commit e97dd8e

Browse files
committed
no mac intel -> cleanup
1 parent de924ad commit e97dd8e

File tree

1 file changed

+2
-71
lines changed

1 file changed

+2
-71
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ jobs:
5555
./scripts/stop-influxdb.sh
5656
5757
macos:
58-
runs-on: macos-15
58+
runs-on: macos-latest
59+
# Note: Uses InfluxDB amd64 binary which runs on Apple Silicon via Rosetta
5960

6061
steps:
6162
- uses: actions/checkout@v4
@@ -95,76 +96,6 @@ jobs:
9596
chmod +x scripts/build.sh scripts/test.sh
9697
./scripts/build.sh Release
9798
98-
- name: Download InfluxDB (if not cached)
99-
if: steps.cache-influxdb.outputs.cache-hit != 'true'
100-
run: |
101-
scripts/download-influxdb.sh 1.8.10 darwin_amd64
102-
103-
- name: Start InfluxDB
104-
run: |
105-
chmod +x scripts/start-influxdb-native.sh
106-
scripts/start-influxdb-native.sh
107-
108-
- name: Run tests
109-
run: |
110-
./scripts/test.sh
111-
112-
- name: Run demo
113-
run: |
114-
./scripts/run-demo.sh
115-
116-
- name: Stop InfluxDB
117-
if: always()
118-
run: |
119-
echo "Stopping InfluxDB..."
120-
if [ -n "$INFLUXDB_PID" ]; then
121-
kill $INFLUXDB_PID 2>/dev/null || true
122-
fi
123-
# Fallback: try to find and kill any remaining influxd processes
124-
pkill -f "influxd.*influxdb.conf" 2>/dev/null || true
125-
126-
macos-arm:
127-
runs-on: macos-latest
128-
# Note: Uses Apple Silicon runner with InfluxDB amd64 binary via Rosetta (similar to Windows approach)
129-
130-
steps:
131-
- uses: actions/checkout@v4
132-
133-
- name: Cache Conan
134-
uses: actions/cache@v4
135-
with:
136-
path: ~/.conan2
137-
key: conan-${{ runner.os }}-${{ hashFiles('**/conanfile.py') }}
138-
restore-keys: |
139-
conan-${{ runner.os }}-
140-
141-
- name: Cache InfluxDB
142-
uses: actions/cache@v4
143-
id: cache-influxdb
144-
with:
145-
path: |
146-
influxdb-1.8.10-1
147-
influxdb-1.8.10_darwin_amd64.tar.gz
148-
key: influxdb-1.8.10-macos-arm-${{ runner.os }}
149-
restore-keys: |
150-
influxdb-1.8.10-macos-arm-
151-
152-
- name: Install Conan
153-
run: |
154-
pip install conan
155-
156-
- name: Configure Conan for C++20
157-
run: |
158-
conan profile detect --force
159-
# Override to C++20 (not gnu20 to match CMAKE_CXX_EXTENSIONS=OFF)
160-
sed -i '' 's/compiler\.cppstd=.*/compiler.cppstd=20/' ~/.conan2/profiles/default || true
161-
echo "compiler.cppstd=20" >> ~/.conan2/profiles/default || true
162-
163-
- name: Build project
164-
run: |
165-
chmod +x scripts/build.sh scripts/test.sh
166-
./scripts/build.sh Release
167-
16899
- name: Download InfluxDB (if not cached)
169100
if: steps.cache-influxdb.outputs.cache-hit != 'true'
170101
run: |

0 commit comments

Comments
 (0)