diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8db8aec..327eaf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,28 +126,6 @@ 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-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 uses: ./.github/workflows/deploy-package-action.yml @@ -158,8 +136,6 @@ jobs: - docs - build-python-package - test-fips - # - upload-build-artifacts - # - upload-toolchain-artifacts create-release: name: Create Github Release @@ -185,8 +161,6 @@ jobs: #- build-cross - test - docs - # - upload-build-artifacts - # - upload-toolchain-artifacts - deploy-python-package - create-release steps: diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 4c25b4f..6120765 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -156,6 +156,8 @@ jobs: - name: Upload ${{ matrix.python }}-${{ matrix.arch }}-${{ matrix.platform }}.tar.xz id: upload-python-build-assets uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_name: ${{ matrix.python }}-${{ matrix.arch }}-${{ matrix.platform }}.tar.xz diff --git a/relenv/common.py b/relenv/common.py index aeef897..7154ae5 100644 --- a/relenv/common.py +++ b/relenv/common.py @@ -18,7 +18,7 @@ import time # relenv package version -__version__ = "0.17.400005" +__version__ = "0.17.400006" MODULE_DIR = pathlib.Path(__file__).resolve().parent diff --git a/relenv/fetch.py b/relenv/fetch.py index 75f9b36..5e69570 100644 --- a/relenv/fetch.py +++ b/relenv/fetch.py @@ -58,7 +58,7 @@ def fetch(version, triplet, python, check_hosts=CHECK_HOSTS): if check_url(url, timeout=5): break else: - print(f"Unable to find file on any hosts {' '.join(check_hosts)}") + print(f"Unable to find file on any hosts: github.com {' '.join(x.split('/')[0] for x in check_hosts)}") sys.exit(1) builddir = work_dir("build", DATA_DIR) os.makedirs(builddir, exist_ok=True)