Skip to content

Commit c62f3bc

Browse files
committed
Revert "CI: Fix"
This reverts commit cc5cf07.
1 parent cc5cf07 commit c62f3bc

4 files changed

Lines changed: 26 additions & 35 deletions

File tree

.github/workflows/swift.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,20 @@ jobs:
1818
- name: Select Xcode
1919
run: sudo xcode-select -s /Applications/Xcode_15.4.app
2020

21-
- name: Install Dependencies
22-
run: brew install freetds pkg-config
23-
24-
- name: Setup pkg-config
25-
run: |
26-
# Generate freetds.pc dynamically to match runner architecture (Intel/ARM)
27-
mkdir -p pkgconfig
28-
FREETDS_PREFIX=$(brew --prefix freetds)
29-
cat <<EOF > pkgconfig/freetds.pc
30-
prefix=${FREETDS_PREFIX}
31-
exec_prefix=\${prefix}
32-
libdir=\${exec_prefix}/lib
33-
includedir=\${prefix}/include
34-
35-
Name: FreeTDS
36-
Description: FreeTDS library
37-
Version: 1.5
38-
Libs: -L\${libdir} -lsybdb -liconv
39-
Cflags: -I\${includedir}
40-
EOF
41-
echo "PKG_CONFIG_PATH=${GITHUB_WORKSPACE}/pkgconfig" >> $GITHUB_ENV
21+
- name: Install FreeTDS
22+
run: brew install freetds
4223

4324
- name: Build
4425
run: |
26+
export PKG_CONFIG_PATH="$(brew --prefix freetds)/lib/pkgconfig:/opt/homebrew/lib/pkgconfig"
27+
mkdir -p /opt/homebrew/lib/pkgconfig
28+
cp ci/freetds.pc /opt/homebrew/lib/pkgconfig/freetds.pc
4529
echo "pkg-config check: $(pkg-config --cflags --libs freetds)"
4630
swift build -v
4731
4832
- name: Test
4933
run: |
34+
export PKG_CONFIG_PATH="$(brew --prefix freetds)/lib/pkgconfig:/opt/homebrew/lib/pkgconfig"
5035
swift test -v
5136
env:
5237
HOST: ${{ secrets.DB_HOST }}

Sources/CFreeTDS/module.modulemap

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
module CFreeTDS [system] {
2-
header "include/CFreeTDS.h"
3-
export *
4-
}
1+
#ifndef CFREETDS_H
2+
#define CFREETDS_H
3+
4+
#include <sybfront.h>
5+
#include <sybdb.h>
6+
7+
#endif

ci/freetds.pc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# FreeTDS pkg-config file for macOS (Apple Silicon)
2+
# Committed to repo because Homebrew's freetds does not ship a .pc file on macOS.
3+
# Linux users: this file is ignored; FreeTDS is found via system pkg-config.
4+
prefix=/opt/homebrew/opt/freetds
5+
exec_prefix=${prefix}
6+
libdir=${exec_prefix}/lib
7+
includedir=${prefix}/include
8+
9+
Name: FreeTDS
10+
Description: FreeTDS library
11+
Version: 1.0
12+
Libs: -L${libdir} -lsybdb -liconv
13+
Cflags: -I${includedir}

pkgconfig/freetds.pc

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

0 commit comments

Comments
 (0)