Skip to content

Commit 1d58e96

Browse files
datbthdatbth
committed
Merge remote-tracking branch 'origin/main' into HEAD
2 parents 77b60b9 + f8821d6 commit 1d58e96

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+8437
-7036
lines changed

‎.github/workflows/deps.yaml

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

‎.github/workflows/duplicate_arrow_mappings.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Duplicate Arrow Mappings
2+
on:
3+
workflow_dispatch:
4+
jobs:
5+
update-arrow-mappings:
6+
runs-on: macos-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- name: Duplicate Arrow Mappings
10+
shell: bash
11+
run: |
12+
make duplicate.arrow.mapping FILE_SUFFIX=darwin_amd64 OS_ARCH=darwin-amd64
13+
make duplicate.arrow.mapping FILE_SUFFIX=darwin_arm64 OS_ARCH=darwin-arm64
14+
make duplicate.arrow.mapping FILE_SUFFIX=linux_amd64 OS_ARCH=linux-amd64
15+
make duplicate.arrow.mapping FILE_SUFFIX=linux_arm64 OS_ARCH=linux-arm64
16+
make duplicate.arrow.mapping FILE_SUFFIX=windows_amd64 OS_ARCH=windows-amd64
17+
- name: Push Duplicated Arrow Mappings
18+
uses: stefanzweifel/git-auto-commit-action@v5
19+
with:
20+
commit_message: push duplicated arrow mappings

‎.github/workflows/duplicate_mappings.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Duplicate Mappings
2+
on:
3+
workflow_dispatch:
4+
jobs:
5+
update-mappings:
6+
runs-on: macos-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- name: Duplicate Mappings
10+
shell: bash
11+
run: |
12+
make duplicate.mapping FILE_SUFFIX=darwin_amd64 OS_ARCH=darwin-amd64
13+
make duplicate.mapping FILE_SUFFIX=darwin_arm64 OS_ARCH=darwin-arm64
14+
make duplicate.mapping FILE_SUFFIX=linux_amd64 OS_ARCH=linux-amd64
15+
make duplicate.mapping FILE_SUFFIX=linux_arm64 OS_ARCH=linux-arm64
16+
make duplicate.mapping FILE_SUFFIX=windows_amd64 OS_ARCH=windows-amd64
17+
- name: Push Duplicated Mappings
18+
uses: stefanzweifel/git-auto-commit-action@v5
19+
with:
20+
commit_message: push duplicated mappings

‎.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.23"
16+
go-version: "1.24"
1717
cache: false
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v6

‎.github/workflows/tests.yaml

Lines changed: 81 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@ on:
66

77
jobs:
88
go_test:
9-
name: Test
9+
name: Main Tests
1010
runs-on: ${{ matrix.os }}
1111
defaults:
1212
run:
1313
shell: bash
1414
strategy:
1515
matrix:
16-
os: [ubuntu-latest, macos-latest, windows-latest, macos-13]
17-
go: ["1.23"]
16+
os: [ubuntu-latest, macos-latest, windows-latest, macos-13, ubuntu-24.04-arm]
17+
go: [1.23, 1.24]
1818
fail-fast: false
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-go@v5
2222
with:
2323
go-version: ${{ matrix.go }}
24-
- name: "Run tests"
25-
run: make test
26-
- uses: actions/upload-artifact@v4
27-
with:
28-
name: test
29-
path: go-duckdb.test.exe
30-
retention-days: 1
24+
- name: Run Main Tests
25+
run: |
26+
go test -v
3127
3228
test_examples:
33-
name: Test examples
34-
runs-on: ubuntu-latest
29+
name: Test Examples
30+
runs-on: ${{ matrix.os }}
31+
strategy:
32+
matrix:
33+
os: [ubuntu-latest, macos-latest]
34+
go: [1.23, 1.24]
3535
defaults:
3636
run:
3737
shell: bash
@@ -40,19 +40,75 @@ jobs:
4040
- uses: actions/setup-go@v5
4141
with:
4242
go-version: ${{ matrix.go }}
43-
- name: "Test examples"
44-
run: make examples
45-
46-
freebsd_amd64:
47-
runs-on: ubuntu-latest
43+
- name: Test Examples
44+
run: make test.examples
45+
test-arrow:
46+
name: Test Arrow
47+
runs-on: ${{ matrix.os }}
48+
defaults:
49+
run:
50+
shell: bash
51+
strategy:
52+
matrix:
53+
os: [ubuntu-latest, macos-latest, windows-latest]
54+
go: [1.23, 1.24]
55+
fail-fast: false
4856
steps:
4957
- uses: actions/checkout@v4
50-
- uses: vmactions/freebsd-vm@v1
58+
- uses: actions/setup-go@v5
5159
with:
52-
usesh: true
53-
prepare: |
54-
pkg install -y \
55-
gmake \
56-
git \
57-
go
58-
run: gmake test
60+
go-version: ${{ matrix.go }}
61+
- name: Run Arrow Tests
62+
run: go test -v -tags=duckdb_arrow
63+
test-dynamic-lib:
64+
name: Dynamic Lib Tests
65+
runs-on: ${{ matrix.os }}
66+
defaults:
67+
run:
68+
shell: bash
69+
strategy:
70+
matrix:
71+
go: [1.23, 1.24]
72+
os: [macos-13, macos-14, ubuntu-latest, ubuntu-24.04-arm]
73+
include:
74+
- os: "macos-13"
75+
filename: "libduckdb-osx-universal"
76+
ld_path_env_name: "DYLD_LIBRARY_PATH"
77+
- os: "macos-14"
78+
filename: "libduckdb-osx-universal"
79+
ld_path_env_name: "DYLD_LIBRARY_PATH"
80+
- os: "ubuntu-latest"
81+
filename: "libduckdb-linux-amd64"
82+
ld_path_env_name: "LD_LIBRARY_PATH"
83+
- os: "ubuntu-24.04-arm"
84+
filename: "libduckdb-linux-aarch64"
85+
ld_path_env_name: "LD_LIBRARY_PATH"
86+
fail-fast: false
87+
steps:
88+
- uses: actions/checkout@v4
89+
- uses: actions/setup-go@v5
90+
with:
91+
go-version: ${{ matrix.go }}
92+
- name: Run Dynamic Lib Tests
93+
run: |
94+
make test.dynamic.lib FILENAME=${{ matrix.filename }} VERSION=v1.2.0
95+
CGO_ENABLED=1 CGO_LDFLAGS="-lduckdb -L${SRCDIR}dynamic-dir" ${{ matrix.ld_path_env_name }}=${SRCDIR}dynamic-dir go test -tags=duckdb_use_lib
96+
test-static-lib-darwin-arm64:
97+
name: Static Lib Tests Darwin ARM64
98+
runs-on: macos-latest
99+
defaults:
100+
run:
101+
shell: bash
102+
strategy:
103+
matrix:
104+
go: [1.23, 1.24]
105+
fail-fast: false
106+
steps:
107+
- uses: actions/checkout@v4
108+
- uses: actions/setup-go@v5
109+
with:
110+
go-version: ${{ matrix.go }}
111+
- name: Run Static Lib Tests Darwin ARM64
112+
run: |
113+
make test.static.lib.darwin.arm64 VERSION=v1.2.0
114+
CGO_ENABLED=1 CPPFLAGS="-DDUCKDB_STATIC_BUILD" CGO_LDFLAGS="-lduckdb -lc++ -L${SRCDIR}static-dir" go test -tags=duckdb_use_static_lib

0 commit comments

Comments
 (0)