diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml index a1e3f42..e72e8f9 100644 --- a/.github/workflows/_extension_distribution.yml +++ b/.github/workflows/_extension_distribution.yml @@ -279,6 +279,7 @@ jobs: echo "OPENSSL_USE_STATIC_LIBS=true" >> docker_env.txt echo "DUCKDB_PLATFORM=${{ matrix.duckdb_arch }}" >> docker_env.txt echo "DUCKDB_GIT_VERSION=${{ inputs.duckdb_version }}" >> docker_env.txt + echo "LINUX_CI_IN_DOCKER=1" >> docker_env.txt echo "TOOLCHAIN_FLAGS=${{ matrix.duckdb_arch == 'linux_arm64' && '-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_Fortran_COMPILER=aarch64-linux-gnu-gfortran' || '' }}" >> docker_env.txt - name: Generate timestamp for Ccache entry @@ -309,21 +310,15 @@ jobs: - name: Run configure CI (inside Docker) shell: bash - env: - LINUX_CI_IN_DOCKER: 1 run: | docker run --env-file=docker_env.txt -v `pwd`:/duckdb_build_dir -v `pwd`/ccache_dir:/ccache_dir duckdb/${{ matrix.duckdb_arch }} make configure_ci - name: Build extension (inside Docker) - env: - LINUX_CI_IN_DOCKER: 1 run: | docker run --env-file=docker_env.txt -v `pwd`:/duckdb_build_dir -v `pwd`/ccache_dir:/ccache_dir duckdb/${{ matrix.duckdb_arch }} make release - name: Test extension (inside docker) if: ${{ matrix.duckdb_arch != 'linux_arm64' && inputs.skip_tests == false }} - env: - LINUX_CI_IN_DOCKER: 1 run: | docker run --env-file=docker_env.txt -v `pwd`:/duckdb_build_dir -v `pwd`/ccache_dir:/ccache_dir duckdb/${{ matrix.duckdb_arch }} make test_release @@ -331,7 +326,6 @@ jobs: if: ${{ matrix.duckdb_arch != 'linux_arm64' && inputs.skip_tests == false }} env: DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }} - LINUX_CI_IN_DOCKER: 1 run: | make test_release diff --git a/duckdb_extension_rs.Makefile b/duckdb_extension_rs.Makefile index 4692468..4de5af5 100644 --- a/duckdb_extension_rs.Makefile +++ b/duckdb_extension_rs.Makefile @@ -2,8 +2,9 @@ # # Inputs # EXTENSION_NAME : name of the extension (lower case) +# DUCKDB_VERSION : the minimum version of DuckDB that the extension supports -.PHONY: clean test_debug test_release test debug release install_dev_dependencies all +.PHONY: clean test_debug test_release test debug release install_dev_dependencies all platform ############################################# ### Platform dependent config @@ -185,7 +186,7 @@ test_release_internal: @echo "Running RELEASE tests.." @$(TEST_RUNNER_RELEASE) test_debug_internal: - @echo "Running DEBUG tests.."xw + @echo "Running DEBUG tests.." @$(TEST_RUNNER_DEBUG) tests_skipped: