Skip to content

Commit

Permalink
switcheroo
Browse files Browse the repository at this point in the history
  • Loading branch information
samansmink committed Nov 6, 2024
1 parent 598e6e6 commit 6c2b145
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/_extension_distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion duckdb_extension_rs.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 6c2b145

Please sign in to comment.