From 3e4b1931de02d66c2d520926fa84b55fd9c93fc8 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 30 Oct 2024 15:23:10 -0700 Subject: [PATCH] Do not build 'source' packages for PRs --- .github/workflows/ci.yml | 15 --------------- .github/workflows/scheduled.yml | 15 --------------- .../workflows/templates/build-packages.yml.jinja | 7 ++++++- 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b867f647f1b..df036255167 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -459,20 +459,6 @@ jobs: relenv-version: "0.17.3" python-version: "3.10.15" source: "onedir" - - build-pkgs-src: - name: Build Packages - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - build-salt-onedir - uses: ./.github/workflows/build-packages.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.17.3" - python-version: "3.10.15" - source: "src" build-ci-deps: name: CI Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2128,7 +2114,6 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir - - build-pkgs-src - combine-all-code-coverage - build-ci-deps - windows-2016 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index b3643ee1e24..c31d56ceec7 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -498,20 +498,6 @@ jobs: relenv-version: "0.17.3" python-version: "3.10.15" source: "onedir" - - build-pkgs-src: - name: Build Packages - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - build-salt-onedir - uses: ./.github/workflows/build-packages.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.17.3" - python-version: "3.10.15" - source: "src" build-ci-deps: name: CI Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2006,7 +1992,6 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir - - build-pkgs-src - build-ci-deps - windows-2016 - windows-2019 diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja index e2ae278a044..dd729c25a27 100644 --- a/.github/workflows/templates/build-packages.yml.jinja +++ b/.github/workflows/templates/build-packages.yml.jinja @@ -1,4 +1,9 @@ - <%- for backend in ("onedir", "src") %> +<%- if gh_environment != "ci" -%> +<%- set pkg_types = ("onedir", "src") %> +<%- else -%> +<%- set pkg_types = ("onedir",) %> +<%- endif -%> + <%- for backend in pkg_types %> <%- set job_name = "build-pkgs-{}".format(backend) %> <%- if backend == "src" %> <%- do conclusion_needs.append(job_name) %>