Skip to content

Commit 1938b29

Browse files
committed
Fix CI: correct module.modulemap and improve pkg-config setup
1 parent c62f3bc commit 1938b29

2 files changed

Lines changed: 9 additions & 13 deletions

File tree

.github/workflows/swift.yml

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

21-
- name: Install FreeTDS
22-
run: brew install freetds
21+
- name: Install Dependencies
22+
run: |
23+
brew install freetds pkg-config
2324
2425
- name: Build
2526
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
27+
export PKG_CONFIG_PATH="${{ github.workspace }}/ci"
2928
echo "pkg-config check: $(pkg-config --cflags --libs freetds)"
3029
swift build -v
3130
3231
- name: Test
3332
run: |
34-
export PKG_CONFIG_PATH="$(brew --prefix freetds)/lib/pkgconfig:/opt/homebrew/lib/pkgconfig"
33+
export PKG_CONFIG_PATH="${{ github.workspace }}/ci"
3534
swift test -v
3635
env:
3736
HOST: ${{ secrets.DB_HOST }}

Sources/CFreeTDS/module.modulemap

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

0 commit comments

Comments
 (0)