Skip to content

Commit 8e95da4

Browse files
committed
Remove matrix
1 parent d0575ff commit 8e95da4

File tree

1 file changed

+54
-62
lines changed

1 file changed

+54
-62
lines changed

.github/workflows/IntegrationTests.yml

Lines changed: 54 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,7 @@ jobs:
1111
linux-tests-httpfs:
1212
name: Run tests on Linux
1313
runs-on: ubuntu-latest
14-
strategy:
15-
matrix:
16-
# Add commits/tags to build against other DuckDB versions
17-
duckdb_version: [ '<submodule_version>' ]
18-
arch: ['linux_amd64']
19-
vcpkg_version: [ '2023.04.15' ]
20-
include:
21-
- arch: 'linux_amd64'
22-
vcpkg_triplet: 'x64-linux'
23-
2414
env:
25-
VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
26-
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
2715
S3_TEST_SERVER_AVAILABLE: 1
2816
AWS_DEFAULT_REGION: eu-west-1
2917
AWS_ACCESS_KEY_ID: minio_duckdb_user
@@ -32,66 +20,70 @@ jobs:
3220
DUCKDB_S3_USE_SSL: false
3321
HTTP_PROXY_PUBLIC: localhost:3128
3422
TEST_PERSISTENT_SECRETS_AVAILABLE: true
35-
PYTHON_HTTP_SERVER_URL: http://localhost:8008
36-
PYTHON_HTTP_SERVER_DIR: /tmp/python_test_server
3723
CORE_EXTENSIONS: "parquet;json"
3824
GEN: ninja
25+
VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
26+
VCPKG_TARGET_TRIPLET: x64-linux
27+
PYTHON_HTTP_SERVER_URL: http://localhost:8008
28+
PYTHON_HTTP_SERVER_DIR: /tmp/python_test_server
3929

4030
steps:
41-
- name: Install required ubuntu packages
42-
run: |
43-
sudo apt-get update -y -qq
44-
sudo apt-get install -y -qq build-essential cmake ninja-build ccache python3 libcurl4-openssl-dev
31+
- uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
submodules: 'true'
35+
36+
- uses: actions/setup-python@v4
37+
with:
38+
python-version: '3.10'
4539

46-
- uses: actions/checkout@v3
47-
with:
48-
fetch-depth: 0
49-
submodules: 'true'
40+
- name: Install Ninja
41+
shell: bash
42+
run: sudo apt-get update -y -qq && sudo apt-get install -y -qq ninja-build
5043

51-
- name: Setup Ccache
52-
uses: hendrikmuhs/ccache-action@main
53-
with:
54-
key: ${{ github.job }}
55-
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}
44+
- name: Setup Ccache
45+
uses: hendrikmuhs/ccache-action@main
46+
with:
47+
key: ${{ github.job }}
48+
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}
5649

57-
- name: Checkout DuckDB to version
58-
if: ${{ matrix.duckdb_version != '<submodule_version>'}}
59-
run: |
60-
cd duckdb
61-
git checkout ${{ matrix.duckdb_version }}
50+
- name: Setup vcpkg
51+
uses: lukka/[email protected]
52+
with:
53+
vcpkgGitCommitId: 5e5d0e1cd7785623065e77eff011afdeec1a3574
6254

63-
- name: Fix permissions of test secrets
64-
shell: bash
65-
run: chmod -R 700 data/secrets
55+
- name: Fix permissions of test secrets
56+
shell: bash
57+
run: chmod -R 700 data/secrets
6658

67-
# TODO: fix the authenticated proxy here
68-
- name: Install and run http proxy squid
69-
shell: bash
70-
run: |
71-
sudo apt-get install squid
72-
./scripts/run_squid.sh --port 3128 --log_dir squid_logs &
59+
# TODO: fix the authenticated proxy here
60+
- name: Install and run http proxy squid
61+
shell: bash
62+
run: |
63+
sudo apt-get install squid
64+
./scripts/run_squid.sh --port 3128 --log_dir squid_logs &
7365
74-
- name: Run & Populate Python test server
75-
shell: bash
76-
run: |
77-
mkdir -p $PYTHON_HTTP_SERVER_DIR
78-
cd $PYTHON_HTTP_SERVER_DIR
79-
python3 -m http.server 8008 &
66+
- name: Run & Populate Python test server
67+
shell: bash
68+
run: |
69+
mkdir -p $PYTHON_HTTP_SERVER_DIR
70+
cd $PYTHON_HTTP_SERVER_DIR
71+
python3 -m http.server 8008 &
8072
81-
- name: Build
82-
shell: bash
83-
run: make
73+
- name: Build
74+
shell: bash
75+
run: make
8476

85-
- name: Start test server
86-
shell: bash
87-
run: |
88-
sudo ./scripts/install_s3_test_server.sh
89-
./scripts/generate_presigned_url.sh
90-
source ./scripts/run_s3_test_server.sh
91-
source ./scripts/set_s3_test_server_variables.sh
92-
sleep 60
77+
- name: Start test server
78+
shell: bash
79+
run: |
80+
sudo ./scripts/install_s3_test_server.sh
81+
./scripts/generate_presigned_url.sh
82+
source ./scripts/run_s3_test_server.sh
83+
source ./scripts/set_s3_test_server_variables.sh
84+
sleep 60
9385
94-
- name: Run tests
95-
shell: bash
96-
run: |
97-
make test
86+
- name: Run tests
87+
shell: bash
88+
run: |
89+
make test

0 commit comments

Comments
 (0)