Skip to content

Commit d9dc30d

Browse files
committed
cleanup
1 parent 51eb239 commit d9dc30d

File tree

1 file changed

+2
-78
lines changed

1 file changed

+2
-78
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -50,64 +50,6 @@ jobs:
5050
run: |
5151
./scripts/stop-influxdb.sh
5252
53-
# macos-13: Commented out - testing macos-15 instead (has native C++20 support)
54-
# macos:
55-
# runs-on: macos-13
56-
# # Note: macos-13 is Intel-based and will be deprecated Dec 2025. Docker is not available on any GitHub macOS runners.
57-
# # Integration tests run only on Linux. macOS job verifies build compiles on macOS.
58-
# # We install newer LLVM/Clang via Homebrew for better C++20 support.
59-
#
60-
# steps:
61-
# - uses: actions/checkout@v4
62-
#
63-
# - name: Install Homebrew LLVM (newer Clang for C++20 support)
64-
# run: |
65-
# brew install llvm
66-
# echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
67-
#
68-
# - name: Cache Conan
69-
# uses: actions/cache@v4
70-
# with:
71-
# path: ~/.conan2
72-
# key: conan-${{ runner.os }}-${{ hashFiles('**/conanfile.py') }}
73-
# restore-keys: |
74-
# conan-${{ runner.os }}-
75-
#
76-
# - name: Install Conan
77-
# run: |
78-
# pip install conan
79-
#
80-
# - name: Configure Conan for C++20
81-
# run: |
82-
# conan profile detect --force
83-
# # Use Homebrew's llvm clang
84-
# brew_llvm=$(brew --prefix llvm)
85-
# sed -i '' "s|compiler=.*|compiler=clang|" ~/.conan2/profiles/default || true
86-
# sed -i '' "s|compiler\.version=.*|compiler.version=17|" ~/.conan2/profiles/default || true
87-
# sed -i '' "s|compiler\.libcxx=.*|compiler.libcxx=libc++|" ~/.conan2/profiles/default || true
88-
# # Override to C++20 (not gnu20 to match CMAKE_CXX_EXTENSIONS=OFF)
89-
# sed -i '' 's/compiler\.cppstd=.*/compiler.cppstd=20/' ~/.conan2/profiles/default || true
90-
# echo "compiler.cppstd=20" >> ~/.conan2/profiles/default || true
91-
# # Set compiler paths
92-
# echo "CC=${brew_llvm}/bin/clang" >> ~/.conan2/profiles/default
93-
# echo "CXX=${brew_llvm}/bin/clang++" >> ~/.conan2/profiles/default
94-
#
95-
# - name: Build project
96-
# run: |
97-
# # Ensure we're using Homebrew's clang
98-
# brew_llvm=$(brew --prefix llvm)
99-
# export CC="${brew_llvm}/bin/clang"
100-
# export CXX="${brew_llvm}/bin/clang++"
101-
# export PATH="${brew_llvm}/bin:${PATH}"
102-
# chmod +x scripts/build.sh scripts/test.sh scripts/start-influxdb.sh scripts/stop-influxdb.sh
103-
# ./scripts/build.sh Release
104-
#
105-
# - name: Skip integration tests (Docker unavailable on macOS)
106-
# run: |
107-
# echo "⚠️ Docker is not available on GitHub Actions macOS runners"
108-
# echo "Build completed successfully, but integration tests were skipped."
109-
# echo "For full test coverage, see the Linux runner which supports Docker natively."
110-
11153
macos:
11254
runs-on: macos-15
11355
# Note: Docker is not available on any GitHub macOS runners.
@@ -208,26 +150,8 @@ jobs:
208150
209151
- name: Start InfluxDB
210152
run: |
211-
echo "Starting InfluxDB in background..."
212-
./influxdb-1.8.10-1/usr/bin/influxd -config influxdb.conf &
213-
INFLUXDB_PID=$!
214-
echo "INFLUXDB_PID=${INFLUXDB_PID}" >> $GITHUB_ENV
215-
216-
echo "Waiting for InfluxDB to be ready..."
217-
timeout=30
218-
elapsed=0
219-
while [ $elapsed -lt $timeout ]; do
220-
if curl -s http://localhost:8086/ping > /dev/null 2>&1; then
221-
echo "✓ InfluxDB is ready!"
222-
break
223-
fi
224-
sleep 1
225-
elapsed=$((elapsed + 1))
226-
done
227-
228-
if [ $elapsed -eq $timeout ]; then
229-
echo "⚠ Warning: InfluxDB may not be fully ready yet"
230-
fi
153+
chmod +x scripts/start-influxdb-native.sh
154+
scripts/start-influxdb-native.sh
231155
232156
- name: Run tests
233157
run: |

0 commit comments

Comments
 (0)