diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml index e72e8f9..33c9ca9 100644 --- a/.github/workflows/_extension_distribution.yml +++ b/.github/workflows/_extension_distribution.yml @@ -301,14 +301,14 @@ jobs: restore-keys: | ccache-extension-distribution-${{ matrix.duckdb_arch }}- - - name: Run configure CI (outside Docker) + - name: Run configure (outside Docker) shell: bash env: DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }} run: | make configure_ci - - name: Run configure CI (inside Docker) + - name: Run configure (inside Docker) shell: bash 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 @@ -455,7 +455,7 @@ jobs: echo "CPPFLAGS=-I/opt/homebrew/opt/libomp/include" >> $GITHUB_ENV echo "CXXFLAGS=-I/opt/homebrew/opt/libomp/include" >> $GITHUB_ENV - - name: Run configure CI + - name: Run configure shell: bash env: DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }} @@ -598,7 +598,7 @@ jobs: vcpkgGitCommitId: ${{ inputs.vcpkg_commit }} vcpkgGitURL: ${{ inputs.vcpkg_url }} - - name: Run configure CI + - name: Run configure shell: bash env: DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }} @@ -718,7 +718,7 @@ jobs: with: key: ${{ github.job }}-${{ matrix.duckdb_arch }} - - name: Run configure CI + - name: Run configure shell: bash env: DUCKDB_GIT_VERSION: ${{ inputs.duckdb_version }} diff --git a/duckdb_extension_rs.Makefile b/duckdb_extension_rs.Makefile index 4de5af5..5595596 100644 --- a/duckdb_extension_rs.Makefile +++ b/duckdb_extension_rs.Makefile @@ -43,6 +43,7 @@ ifeq ($(DUCKDB_VERSION),) DUCKDB_VERSION = v0.0.1 endif +# TODO: extension_tag from github actions is not used ifeq ($(EXTENSION_VERSION),) EXTENSION_VERSION = v0.0.1 endif @@ -170,7 +171,7 @@ ifeq ($(LINUX_CI_IN_DOCKER),1) SKIP_TESTS=1 endif -ifeq ($(DUCKDB_PLATFORM),linux_amd64_gcc4) +ifeq ($(DUCKDB_PLATFORM),linux_amd64) SKIP_TESTS=1 endif