From 779ea2bca26f9a2e4a6de97b0eb5fe633e91d9db Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 5 Aug 2024 15:15:01 +0200 Subject: [PATCH 1/4] Fix concurrent artifact-upload error by requiring wheel upload for only one configuration (since os-agnostic) --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acc5b598d..aa58c0ef9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: true + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os = "windows-latest") }} wheelhouse: true standalone_suffix: ${{ inputs.standalone_suffix || ''}} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index ad27ee6fc..ceda75160 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -85,7 +85,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: true + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os = "windows-latest") }} wheelhouse: true standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} From aa2fa1d405ac5ebca4587adcc4d9ff957ae9bd99 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 5 Aug 2024 16:13:15 +0200 Subject: [PATCH 2/4] Fix concurrent artifact-upload error by requiring wheel upload for only one configuration (since os-agnostic) --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa58c0ef9..3c677c650 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os = "windows-latest") }} + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == "windows-latest") }} wheelhouse: true standalone_suffix: ${{ inputs.standalone_suffix || ''}} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index ceda75160..b33816845 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -85,7 +85,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os = "windows-latest") }} + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == "windows-latest") }} wheelhouse: true standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} From aea714ee076ab96adac43c48fe58d3de53ff2cb5 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 5 Aug 2024 16:35:29 +0200 Subject: [PATCH 3/4] Fix concurrent artifact-upload error by requiring wheel upload for only one configuration (since os-agnostic) --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c677c650..7aa1031a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == "windows-latest") }} + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }} wheelhouse: true standalone_suffix: ${{ inputs.standalone_suffix || ''}} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index b33816845..f0ae7ae97 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -85,7 +85,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting - wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == "windows-latest") }} + wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }} wheelhouse: true standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} From f360efa84af89cd27b8cdd5c65e1746854e29ae3 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Tue, 6 Aug 2024 09:57:21 +0200 Subject: [PATCH 4/4] Explain in CI --- .github/workflows/ci.yml | 1 + .github/workflows/ci_release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aa1031a1..3b0cb630d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,6 +81,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting + # Upload the wheel artifact for only one of the OS as it is OS-agnostic wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }} wheelhouse: true standalone_suffix: ${{ inputs.standalone_suffix || ''}} diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index f0ae7ae97..2960228c6 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -85,6 +85,7 @@ jobs: MODULE: ${{env.MODULE}} dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} install_extras: plotting + # Upload the wheel artifact for only one of the OS as it is OS-agnostic wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }} wheelhouse: true standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}