From 2316440b3206f7eceb8a6b9880796e3df687eb6a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 16 Jan 2024 17:41:00 +0000 Subject: [PATCH 1/6] Missed change in 5ea3bf3a9dbd7e128cf8a899b6c06958cdfcbf36 Signed-off-by: Pedro Algarvio --- tools/pkg/build.py | 10 ++++++++-- tools/pkg/repo/create.py | 2 +- tools/release.py | 6 +++--- tools/testsuite/download.py | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/pkg/build.py b/tools/pkg/build.py index 37210e8fa52..e63823551bc 100644 --- a/tools/pkg/build.py +++ b/tools/pkg/build.py @@ -486,7 +486,10 @@ def onedir_dependencies( assert package_name is not None assert platform is not None - if platform not in ("macos", "darwin") and arch == "arm64": + if platform == "darwin": + platform = "macos" + + if platform != "macos" and arch == "arm64": arch = "aarch64" shared_constants = _get_shared_constants() @@ -625,6 +628,9 @@ def salt_onedir( assert platform is not None assert package_name is not None + if platform == "darwin": + platform = "macos" + shared_constants = _get_shared_constants() if not relenv_version: relenv_version = shared_constants["relenv_version"] @@ -706,7 +712,7 @@ def salt_onedir( str(salt_archive), env=env, ) - if platform == "darwin": + if platform == "macos": def errfn(fn, path, err): ctx.info(f"Removing {path} failed: {err}") diff --git a/tools/pkg/repo/create.py b/tools/pkg/repo/create.py index 382ffdd0998..bc36463bbf6 100644 --- a/tools/pkg/repo/create.py +++ b/tools/pkg/repo/create.py @@ -904,7 +904,7 @@ def _create_onedir_based_repo( if distro == "onedir": if "-onedir-linux-" in dpath.name.lower(): release_os = "linux" - elif "-onedir-darwin-" in dpath.name.lower(): + elif "-onedir-macos-" in dpath.name.lower(): release_os = "macos" elif "-onedir-windows-" in dpath.name.lower(): release_os = "windows" diff --git a/tools/release.py b/tools/release.py index cc17938d453..b338721f8bc 100644 --- a/tools/release.py +++ b/tools/release.py @@ -131,13 +131,13 @@ def download_onedir_artifact( Download onedir artifact from staging bucket. """ s3 = boto3.client("s3") - if platform == "macos": - platform = "darwin" + if platform == "darwin": + platform = "macos" if arch == "arm64": arch = "aarch64" arch = arch.lower() platform = platform.lower() - if platform in ("linux", "darwin") and arch not in ("x86_64", "aarch64"): + if platform in ("linux", "macos") and arch not in ("x86_64", "aarch64"): ctx.error( f"The 'arch' value for {platform} must be one of: 'x86_64', 'aarch64', 'arm64'" ) diff --git a/tools/testsuite/download.py b/tools/testsuite/download.py index e9800e0a775..453cbef299f 100644 --- a/tools/testsuite/download.py +++ b/tools/testsuite/download.py @@ -38,7 +38,7 @@ download = command_group( }, "platform": { "help": "The onedir platform artifact to download", - "choices": ("linux", "darwin", "windows"), + "choices": ("linux", "macos", "windows"), "required": True, }, "arch": { From 15d885952ad3ead510009087956199b237eeb913 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 16 Jan 2024 18:24:40 +0000 Subject: [PATCH 2/6] Fix build RPM repository Signed-off-by: Pedro Algarvio --- .github/workflows/build-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 6e1ec435da0..d174c054b39 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -335,7 +335,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ steps.set-artifact-name.outputs.artifact-name }} - path: ~/rpmbuild/RPMS/*/*.rpm + path: ~/rpmbuild/RPMS/${{ matrix.arch }}/*.rpm retention-days: 7 if-no-files-found: error From 874a0726e415c04c48ab01c84a1f909fd32e18b8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 16 Jan 2024 21:54:00 +0000 Subject: [PATCH 3/6] Fix build RPM repository. Signed-off-by: Pedro Algarvio --- .github/workflows/build-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index d174c054b39..5cd7d949e6e 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -335,7 +335,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ steps.set-artifact-name.outputs.artifact-name }} - path: ~/rpmbuild/RPMS/${{ matrix.arch }}/*.rpm + path: ~/rpmbuild/RPMS/${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}/*.rpm retention-days: 7 if-no-files-found: error From 519755d4e7eefd6fff1c26e2a9d40e61af3421f4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 17 Jan 2024 06:04:09 +0000 Subject: [PATCH 4/6] Fix RPM build repository for aarch64 Signed-off-by: Pedro Algarvio --- .github/workflows/nightly.yml | 2 +- .github/workflows/staging.yml | 2 +- .../templates/build-rpm-repo.yml.jinja | 38 +------------------ tools/precommit/workflows.py | 12 ++++++ 4 files changed, 16 insertions(+), 38 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8c5285dc124..5a7d03ca1fa 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2545,7 +2545,7 @@ jobs: - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 1f7644f5bc1..28afc26a243 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2390,7 +2390,7 @@ jobs: - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja index 4c785c82b1d..9f8ca8668be 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -3,41 +3,7 @@ fail-fast: false matrix: include: - <%- for distro, version, arch in ( - ("amazon", "2", "x86_64"), - ("amazon", "2", "arm64"), - ("amazon", "2", "aarch64"), - ("amazon", "2023", "x86_64"), - ("amazon", "2023", "arm64"), - ("amazon", "2023", "aarch64"), - ("redhat", "7", "x86_64"), - ("redhat", "7", "arm64"), - ("redhat", "7", "aarch64"), - ("redhat", "8", "x86_64"), - ("redhat", "8", "arm64"), - ("redhat", "8", "aarch64"), - ("redhat", "9", "x86_64"), - ("redhat", "9", "arm64"), - ("redhat", "9", "aarch64"), - ("fedora", "36", "x86_64"), - ("fedora", "36", "arm64"), - ("fedora", "36", "aarch64"), - ("fedora", "37", "x86_64"), - ("fedora", "37", "arm64"), - ("fedora", "37", "aarch64"), - ("fedora", "38", "x86_64"), - ("fedora", "38", "arm64"), - ("fedora", "38", "aarch64"), - ("photon", "3", "x86_64"), - ("photon", "3", "arm64"), - ("photon", "3", "aarch64"), - ("photon", "4", "x86_64"), - ("photon", "4", "arm64"), - ("photon", "4", "aarch64"), - ("photon", "5", "x86_64"), - ("photon", "5", "arm64"), - ("photon", "5", "aarch64"), - ) %> + <%- for distro, version, arch in build_rpms_listing %> - pkg-type: rpm distro: <{ distro }> version: "<{ version }>" @@ -66,7 +32,7 @@ - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index f75c40df120..3dd1746d400 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -252,6 +252,17 @@ def generate_workflows(ctx: Context): for _, arch, _ in test_salt_pkg_downloads_listing[platform]: test_salt_pkg_downloads_needs_slugs.add("build-ci-deps") + build_rpms_listing = [] + for distro, releases in ( + ("amazon", ("2", "2023")), + ("redhat", ("7", "8", "9")), + ("fedora", ("36", "37", "38")), + ("photon", ("3", "4", "5")), + ): + for release in releases: + for arch in ("x86_64", "arm64", "aarch64"): + build_rpms_listing.append((distro, release, arch)) + env = Environment( block_start_string="<%", block_end_string="%>", @@ -293,6 +304,7 @@ def generate_workflows(ctx: Context): "test_salt_pkg_downloads_needs_slugs": sorted( test_salt_pkg_downloads_needs_slugs ), + "build_rpms_listing": build_rpms_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 51f2b0b0c1a5f67acb9fdf0d50df63305c8523d2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 17 Jan 2024 06:10:32 +0000 Subject: [PATCH 5/6] Define the DEBs listing outside of the template Signed-off-by: Pedro Algarvio --- .../workflows/templates/build-deb-repo.yml.jinja | 13 +------------ tools/precommit/workflows.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/templates/build-deb-repo.yml.jinja b/.github/workflows/templates/build-deb-repo.yml.jinja index ac0bc159da4..4b8edb516b2 100644 --- a/.github/workflows/templates/build-deb-repo.yml.jinja +++ b/.github/workflows/templates/build-deb-repo.yml.jinja @@ -3,18 +3,7 @@ fail-fast: false matrix: include: - <%- for distro, version, arch in ( - ("debian", "10", "x86_64"), - ("debian", "10", "arm64"), - ("debian", "11", "x86_64"), - ("debian", "11", "arm64"), - ("debian", "12", "x86_64"), - ("debian", "12", "arm64"), - ("ubuntu", "20.04", "x86_64"), - ("ubuntu", "20.04", "arm64"), - ("ubuntu", "22.04", "x86_64"), - ("ubuntu", "22.04", "arm64"), - ) %> + <%- for distro, version, arch in build_debs_listing %> - pkg-type: deb distro: <{ distro }> version: "<{ version }>" diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index 3dd1746d400..e76b77564b3 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -263,6 +263,15 @@ def generate_workflows(ctx: Context): for arch in ("x86_64", "arm64", "aarch64"): build_rpms_listing.append((distro, release, arch)) + build_debs_listing = [] + for distro, releases in ( + ("debian", ("10", "11", "12")), + ("ubuntu", ("20.04", "22.04")), + ): + for release in releases: + for arch in ("x86_64", "arm64"): + build_debs_listing.append((distro, release, arch)) + env = Environment( block_start_string="<%", block_end_string="%>", @@ -305,6 +314,7 @@ def generate_workflows(ctx: Context): test_salt_pkg_downloads_needs_slugs ), "build_rpms_listing": build_rpms_listing, + "build_debs_listing": build_debs_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 91718dd8c94b1d25386443979423eaf45b83bd5f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 17 Jan 2024 06:25:34 +0000 Subject: [PATCH 6/6] Set `PIP_DISABLE_PIP_VERSION_CHECK=1` on CI workflows Signed-off-by: Pedro Algarvio --- .github/workflows/build-deps-ci-action.yml | 1 + .github/workflows/build-deps-onedir.yml | 1 + .github/workflows/build-docs.yml | 1 + .github/workflows/build-packages.yml | 1 + .github/workflows/build-salt-onedir.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/lint-action.yml | 1 + .github/workflows/nightly.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/scheduled.yml | 1 + .github/workflows/staging.yml | 1 + .github/workflows/templates/build-deps-ci-action.yml.jinja | 1 + .github/workflows/templates/layout.yml.jinja | 1 + .../workflows/templates/test-package-downloads-action.yml.jinja | 1 + .github/workflows/test-action-linux.yml | 1 + .github/workflows/test-action-macos.yml | 1 + .github/workflows/test-action-windows.yml | 1 + .github/workflows/test-package-downloads-action.yml | 1 + .github/workflows/test-packages-action-linux.yml | 1 + .github/workflows/test-packages-action-macos.yml | 1 + .github/workflows/test-packages-action-windows.yml | 1 + 21 files changed, 21 insertions(+) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index fcdd9f37714..672a7a9a799 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -42,6 +42,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index d99fc0e2461..41d6f0260fe 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -34,6 +34,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index a2692d7ac1f..20894f35b45 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -19,6 +19,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: build: diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 5cd7d949e6e..945ed07064e 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -41,6 +41,7 @@ env: COLUMNS: 190 PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index eb807bd7fed..7e3a6dc2807 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -34,6 +34,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6f51eec55e..92a2e8caa34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" permissions: contents: read # for dorny/paths-filter to fetch a list of changed files diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index fb414dd9610..6f177667129 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -13,6 +13,7 @@ on: env: PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5a7d03ca1fa..9aa9a2a22bc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -24,6 +24,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" permissions: contents: read # for dorny/paths-filter to fetch a list of changed files diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2f738ab900..74fa46c6888 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" permissions: contents: write # To be able to publish the release diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 80c78a80e88..7d9bb9f8e6d 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -14,6 +14,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" permissions: contents: read # for dorny/paths-filter to fetch a list of changed files diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 28afc26a243..228644d822f 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -39,6 +39,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" permissions: contents: read # for dorny/paths-filter to fetch a list of changed files diff --git a/.github/workflows/templates/build-deps-ci-action.yml.jinja b/.github/workflows/templates/build-deps-ci-action.yml.jinja index 100edcab7c4..2d72b1a5e91 100644 --- a/.github/workflows/templates/build-deps-ci-action.yml.jinja +++ b/.github/workflows/templates/build-deps-ci-action.yml.jinja @@ -42,6 +42,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index dd0d97c427d..a005668d7e5 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -36,6 +36,7 @@ env: COLUMNS: 190 CACHE_SEED: SEED-7 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" + PIP_DISABLE_PIP_VERSION_CHECK: "1" <%- endblock env %> diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 5fe5d927d20..30aa6561009 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -54,6 +54,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-action-linux.yml b/.github/workflows/test-action-linux.yml index c1399e56fbf..bc1c0d7f218 100644 --- a/.github/workflows/test-action-linux.yml +++ b/.github/workflows/test-action-linux.yml @@ -77,6 +77,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 9c731f2bd27..a6d6bbf9ca2 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -70,6 +70,7 @@ env: COLUMNS: 190 PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/" PIP_EXTRA_INDEX_URL: "https://pypi.org/simple" + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-action-windows.yml b/.github/workflows/test-action-windows.yml index d430baab46a..bdf11a29abd 100644 --- a/.github/workflows/test-action-windows.yml +++ b/.github/workflows/test-action-windows.yml @@ -77,6 +77,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 21093ca3a51..0146881e54f 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -54,6 +54,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml index 042f790c072..daca46c243d 100644 --- a/.github/workflows/test-packages-action-linux.yml +++ b/.github/workflows/test-packages-action-linux.yml @@ -71,6 +71,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 95da028d3e3..1e46737cc8f 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -64,6 +64,7 @@ env: COLUMNS: 190 PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: diff --git a/.github/workflows/test-packages-action-windows.yml b/.github/workflows/test-packages-action-windows.yml index dc8c290c9fb..62203dfd8d5 100644 --- a/.github/workflows/test-packages-action-windows.yml +++ b/.github/workflows/test-packages-action-windows.yml @@ -71,6 +71,7 @@ env: AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple + PIP_DISABLE_PIP_VERSION_CHECK: "1" jobs: