From ae325e5ae8ab23d3a319ec06e519c7646d6dd7b1 Mon Sep 17 00:00:00 2001 From: Zuleykha Pavlichenkova Date: Thu, 11 Jul 2024 12:49:39 +0200 Subject: [PATCH 1/3] added two more jobs to build and deploy main version --- .../workflows/MainDistributionPipeline.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 1e26fae9..d2ae3c22 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -29,4 +29,23 @@ jobs: duckdb_version: v1.0.0 extension_name: sqlsmith exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' + deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} + + duckdb-main-build: + name: Build extension binaries + uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0 + with: + duckdb_version: main + extension_name: sqlsmith + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' + + duckdb-main-deploy: + name: Deploy extension binaries + needs: duckdb-stable-build + uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0 + secrets: inherit + with: + duckdb_version: main + extension_name: sqlsmith + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file From 4a6dd95244b42d99b498ce8e2fbb0cba2a609c49 Mon Sep 17 00:00:00 2001 From: Zuleykha Pavlichenkova Date: Fri, 12 Jul 2024 15:10:05 +0200 Subject: [PATCH 2/3] Removed exluding architectures --- .github/workflows/MainDistributionPipeline.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index d2ae3c22..f30530cd 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -18,7 +18,6 @@ jobs: with: duckdb_version: v1.0.0 extension_name: sqlsmith - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' duckdb-stable-deploy: name: Deploy extension binaries @@ -28,24 +27,11 @@ jobs: with: duckdb_version: v1.0.0 extension_name: sqlsmith - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} duckdb-main-build: - name: Build extension binaries + name: Build extension binaries (main) uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0 with: duckdb_version: main extension_name: sqlsmith - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' - - duckdb-main-deploy: - name: Deploy extension binaries - needs: duckdb-stable-build - uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0 - secrets: inherit - with: - duckdb_version: main - extension_name: sqlsmith - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools' - deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file From b9a8a8a23b8d18105bc4a284593513b24f51a284 Mon Sep 17 00:00:00 2001 From: Zuleykha Pavlichenkova Date: Fri, 12 Jul 2024 15:11:35 +0200 Subject: [PATCH 3/3] Put repeating job in a matrix --- .github/workflows/MainDistributionPipeline.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index f30530cd..ebd7d0ae 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -15,8 +15,11 @@ jobs: duckdb-stable-build: name: Build extension binaries uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0 + strategy: + matrix: + duckdb_version: ["v1.0.0", "main"] with: - duckdb_version: v1.0.0 + duckdb_version: ${{ matrix.duckdb_version }} extension_name: sqlsmith duckdb-stable-deploy: @@ -27,11 +30,4 @@ jobs: with: duckdb_version: v1.0.0 extension_name: sqlsmith - deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} - - duckdb-main-build: - name: Build extension binaries (main) - uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0 - with: - duckdb_version: main - extension_name: sqlsmith + deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file