diff --git a/.github/actions/build-node-python/action.yml b/.github/actions/build-node-python/action.yml index f5ae5da9..3014cfc8 100644 --- a/.github/actions/build-node-python/action.yml +++ b/.github/actions/build-node-python/action.yml @@ -129,7 +129,8 @@ runs: uses: actions/setup-python@v6 if: inputs.enable_python == 'true' with: - python-version: ${{ inputs.python_version || '3.10' }} + python-version-file: pyproject.toml + python-version: ${{ inputs.python_version || null }} # cache: ${{ inputs.enable_python_cache == 'true' && 'pip' || null }} Disable cache as uv is probably faster anyways: https://github.com/actions/setup-python/issues/822 - name: Install additional python requirements if: inputs.enable_python == 'true' diff --git a/.github/workflows/build-docker-artifacts-trigger-push.yml b/.github/workflows/build-docker-artifacts-trigger-push.yml index 169187aa..4cb89835 100644 --- a/.github/workflows/build-docker-artifacts-trigger-push.yml +++ b/.github/workflows/build-docker-artifacts-trigger-push.yml @@ -77,12 +77,12 @@ jobs: const imageTagAfterRetag = "${{ github.ref }}".replace('refs/heads/', '').replace('refs/tags/', '').replace(/[^a-zA-Z0-9._-]/g, '-'); - const result = customers.map((c) => ({ + const result = customers.flatMap((c) => config.push?.[c] ? [{ repository: process.env.REPOSITORY, customer: c, customer_json: JSON.stringify(config.push[c]), image_tag: imageTagAfterRetag, - })); + }] : []); console.log(result); return result; env: