Use git source

marcboeker · Oct 8, 2023 · 1b12386 · 1b12386
1 parent c08d3bc
commit 1b12386
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 446,804 deletions.
diff --git a/.github/workflows/deps.yaml b/.github/workflows/deps.yaml
@@ -17,12 +17,7 @@ jobs:
           with:
             ref: ${{ github.head_ref }}
         - shell: bash
-          run: make deps.source
-        - uses: actions/upload-artifact@v3
-          with:
-            name: duckdb
-            path: duckdb/
-            retention-days: 1
+          run: make deps.header
         - uses: actions/upload-artifact@v3
           with:
             name: duckdb_h
@@ -35,10 +30,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: duckdb
-          path: duckdb/
       - shell: bash
         run: make deps.darwin.amd64
       - uses: actions/upload-artifact@v3
@@ -53,10 +44,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: duckdb
-          path: duckdb/
       - shell: bash
         run: make deps.darwin.arm64
       - uses: actions/upload-artifact@v3
@@ -71,10 +58,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: duckdb
-          path: duckdb/
       - shell: bash
         run: make deps.linux.amd64
       - uses: actions/upload-artifact@v3
@@ -89,10 +72,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: duckdb
-          path: duckdb/
       - name: Install cross compile toolchain
         shell: bash
         run: |

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .vscode
 .DS_Store
 run.sh
-duckdb/
+duckdb-*/
+duckdb.zip
 .idea
diff --git a/Makefile b/Makefile
@@ -16,14 +16,15 @@ SRC_DIR := duckdb/src/amalgamation
 FILES := $(wildcard $(SRC_DIR)/*)
 
 .PHONY: deps.source
-deps.source:
+deps.header:
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cp duckdb/src/include/duckdb.h duckdb.h
 
 .PHONY: deps.darwin.amd64
 deps.darwin.amd64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
 
+	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
 	make -j 8 && \
 	mkdir -p lib && \
@@ -37,6 +38,7 @@ deps.darwin.amd64:
 deps.darwin.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
 
+	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
 	make -j 8 && \
 	mkdir -p lib && \
@@ -50,6 +52,7 @@ deps.darwin.arm64:
 deps.linux.amd64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
 
+	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
 	make -j 8 && \
 	mkdir -p lib && \
@@ -63,6 +66,7 @@ deps.linux.amd64:
 deps.linux.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
 
+	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb && \
 	make -j 8 && \
 	mkdir -p lib && \