Skip to content

Commit

Permalink
Add transitional logic
Browse files Browse the repository at this point in the history
- Download toolchain from packages.broadcom.com
- Upload python builds to release artifacts
- Disable deployment to packages.saltproject.io
  • Loading branch information
dwoz committed Oct 26, 2024
1 parent 76341b3 commit c222480
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 22 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,27 @@ jobs:
with:
changed-files: ${{ needs.get-changed-files.outputs.changed-files }}

upload-build-artifacts:
name: Deploy Prebuilt Python Builds
if: ${{ inputs.kind == 'release' && success() }}
uses: ./.github/workflows/deploy-build-action.yml
needs:
- build-python-package
- build-native
- test-fips
#- build-cross
with:
version: "${{ needs.build-python-package.outputs.version }}"
#upload-build-artifacts:
# name: Deploy Prebuilt Python Builds
# if: ${{ inputs.kind == 'release' && success() }}
# uses: ./.github/workflows/deploy-build-action.yml
# needs:
# - build-python-package
# - build-native
# - test-fips
# #- build-cross
# with:
# version: "${{ needs.build-python-package.outputs.version }}"

upload-toolchain-artifacts:
name: Deploy Toolchain
if: ${{ inputs.kind == 'release' && success() }}
uses: ./.github/workflows/deploy-toolchain-action.yml
needs:
- build-python-package
- toolchain
with:
version: "${{ needs.build-python-package.outputs.version }}"
#upload-toolchain-artifacts:
# name: Deploy Toolchain
# if: ${{ inputs.kind == 'release' && success() }}
# uses: ./.github/workflows/deploy-toolchain-action.yml
# needs:
# - build-python-package
# - toolchain
# with:
# version: "${{ needs.build-python-package.outputs.version }}"

deploy-python-package:
name: Deploy Python Package
Expand Down
5 changes: 4 additions & 1 deletion relenv/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@

MACOS_DEVELOPMENT_TARGET = "10.15"

CHECK_HOSTS = ("repo.saltproject.io", "woz.io")
CHECK_HOSTS = (
"packages.broadcom.com/artifactory/saltproject-generic" "repo.saltproject.io",
"woz.io",
)

arches = {
LINUX: (
Expand Down
7 changes: 6 additions & 1 deletion relenv/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
TC_URL = "https://{hostname}/relenv/{version}/toolchain/{host}/{triplet}.tar.xz"
CICD = "CI" in os.environ

LAST_RELENV_W_TOOLCHAIN = "0.17.4"


def setup_parser(subparsers):
"""
Expand Down Expand Up @@ -91,7 +93,10 @@ def fetch(arch, toolchain, clean=False, version=__version__):
check_hosts = [os.environ["RELENV_FETCH_HOST"]]
for host in check_hosts:
url = TC_URL.format(
hostname=host, version=version, host=platform.machine(), triplet=triplet
hostname=host,
version=LAST_RELENV_W_TOOLCHAIN,
host=platform.machine(),
triplet=triplet,
)
if check_url(url, timeout=5):
break
Expand Down

0 comments on commit c222480

Please sign in to comment.