diff --git a/.github/workflows/CloudTesting.yml b/.github/workflows/CloudTesting.yml index 092a837..54c9c66 100644 --- a/.github/workflows/CloudTesting.yml +++ b/.github/workflows/CloudTesting.yml @@ -14,9 +14,8 @@ jobs: env: VCPKG_TARGET_TRIPLET: x64-linux VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake - GEN: Ninja + GEN: ninja DUCKDB_PLATFORM: linux_amd64 - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true steps: - name: Install required ubuntu packages @@ -40,7 +39,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11.1 with: - vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 + vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574 - name: Build extension env: diff --git a/.github/workflows/LocalTesting.yml b/.github/workflows/LocalTesting.yml index 5bb46fe..9df1496 100644 --- a/.github/workflows/LocalTesting.yml +++ b/.github/workflows/LocalTesting.yml @@ -11,45 +11,39 @@ jobs: azurite-tests-linux: name: Azurite tests (Linux) runs-on: ubuntu-latest - container: 'quay.io/pypa/manylinux2014_x86_64' env: VCPKG_TARGET_TRIPLET: 'x64-linux' - GEN: Ninja + GEN: ninja VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake AZURE_STORAGE_CONNECTION_STRING: 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;' AZURE_STORAGE_ACCOUNT: devstoreaccount1 HTTP_PROXY_RUNNING: '1' - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 submodules: 'true' + - uses: actions/setup-node@v4 + - name: install Azure test service run: | - yum install -y nodejs npm squid + sudo apt-get install -y azure-cli squid ninja-build npm install -g azurite - echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | tee /etc/yum.repos.d/azure-cli.repo - yum install -y azure-cli - name: Launch & populate Azure test service run: | azurite > azurite_log.txt 2>&1 & - ./scripts/run_squid.sh --port 3128 --log_dir squid_logs & - ./scripts/run_squid.sh --port 3129 --log_dir squid_auth_logs --auth & + sudo ./scripts/run_squid.sh --port 3128 --log_dir squid_logs & + sudo ./scripts/run_squid.sh --port 3129 --log_dir squid_auth_logs --auth & sleep 10 ./scripts/upload_test_files_to_azurite.sh - - name: Setup ManyLinux2014 - run: | - ./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh openssl python_alias - - name: Setup vcpkg uses: lukka/run-vcpkg@v11.1 with: - vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 + vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574 # Build extension - name: Build extension @@ -75,10 +69,10 @@ jobs: cat azurite_log.txt echo "## squid" - cat squid_logs/* + sudo cat squid_logs/* echo "## squid auth" - cat squid_auth_logs/* + sudo cat squid_auth_logs/* azurite-tests-macos: name: Azurite tests (MacOS) @@ -86,7 +80,7 @@ jobs: env: VCPKG_TARGET_TRIPLET: 'x64-osx' OSX_BUILD_ARCH: 'x86_64' - GEN: Ninja + GEN: ninja VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake AZURE_STORAGE_CONNECTION_STRING: 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;' AZURE_STORAGE_ACCOUNT: devstoreaccount1 @@ -113,7 +107,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 + vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574 - name: Build extension shell: bash @@ -150,7 +144,6 @@ jobs: runs-on: windows-latest env: VCPKG_TARGET_TRIPLET: 'x64-windows' - GEN: Ninja VCPKG_ROOT: ${{ github.workspace }}\vcpkg VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake AZURE_STORAGE_CONNECTION_STRING: 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;' @@ -165,7 +158,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 + vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574 - uses: actions/setup-python@v2 with: diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 90a39a6..1c33eb0 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -19,7 +19,7 @@ jobs: extension_name: azure duckdb_version: main ci_tools_version: main - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' duckdb-stable-deploy: name: Deploy extension binaries @@ -30,5 +30,5 @@ jobs: extension_name: azure duckdb_version: main ci_tools_version: main - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/duckdb b/duckdb index 78ebe44..f99785b 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 78ebe44ef9f31b43cfc41b3bf739ab9069e16ae8 +Subproject commit f99785b78ae4724b31d9b41435ad8c17e57ee8f4 diff --git a/extension-ci-tools b/extension-ci-tools index 46a8dd6..0cd9d80 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 46a8dd6850b218b2c1a0ede5daf5053bdc225102 +Subproject commit 0cd9d804a40f256e90170c1c3c9922734e198e3f