Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Merge workflows into build.yml #36446

Closed
wants to merge 37 commits into from
Closed

CI: Merge workflows into build.yml #36446

wants to merge 37 commits into from

Commits on Oct 8, 2023

  1. bootstrap-conda: Generate environment files with hard-coded Python mi… 

    …nor versions (environment-3.9.yml etc.)

This is convenient for conda-lock.

Partial cherry-pick from "Use conda-lock for reproducible conda env"
    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    6127016 View commit details
    Browse the repository at this point in the history

  2. src/doc/en/installation/conda.rst: Update for versioned environment-.… 

    ….. files
    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    03a2acf View commit details
    Browse the repository at this point in the history

  3. bootstrap, Makefile (bootstrap-clean): Update for versioned environme… 

    …nt-... files
    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    5c0bac8 View commit details
    Browse the repository at this point in the history

  4. tox.ini (local-conda-environment): Update for versioned environment-.… 

    ….. files
    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    c2be172 View commit details
    Browse the repository at this point in the history

  5. .github/workflows/ci-conda.yml: Update for versioned environment*.yml

    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    b3ba591 View commit details
    Browse the repository at this point in the history

  6. .github/workflows/ci-conda.yml: Fix environment name

    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    018de2b View commit details
    Browse the repository at this point in the history

  7. tox.ini (conda-environment-{src,dev}), .github/workflows/ci-conda.yml… 

    …: Use configure --enable-system-site-packages
    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    fc9bab5 View commit details
    Browse the repository at this point in the history

  8. bootstrap-conda: Refactor using sage-get-system-packages

    @mkoeppe
    mkoeppe committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    b02ef8e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. bootstrap-conda: Only one 'python' line + speed up

    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    235ce91 View commit details
    Browse the repository at this point in the history

  2. build/sage_bootstrap/download/mirror_list.py: Remove sagepad.org

    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    3332a89 View commit details
    Browse the repository at this point in the history

  3. sage_bootstrap.{tarball, download.mirror_list}: Lower layout of the m… 

    …irror to mirror_list
    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    dd939ff View commit details
    Browse the repository at this point in the history

  4. sage_bootstrap.download.mirror_list: Delay downloading/reading/rankin… 

    …g to first use
    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    2dfe081 View commit details
    Browse the repository at this point in the history

  5. sage_bootstrap.download.mirror_list: Use master list of download sour… 

    …ces in SAGE_ROOT/.upstream.d
    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    a37f4fd View commit details
    Browse the repository at this point in the history

  6. src/bin/sage-update-version: Update .upstream.d/20-github.com-sagemat… 

    …h-sage-releases
    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    2323480 View commit details
    Browse the repository at this point in the history

  7. sage_bootstrap.download.mirror_list: Skip empty lines earlier

    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    7e65260 View commit details
    Browse the repository at this point in the history

  8. src/bin/sage-update-version: Also commit

    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    371be50 View commit details
    Browse the repository at this point in the history

  9. build/bin/write-dockerfile.sh: ADD .upstream.d

    @mkoeppe
    mkoeppe committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    423e48a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. bootstrap-conda (src/environment-dev*.yml): Suppress pip section, for… 

    … now
    @mkoeppe
    mkoeppe committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    73ab316 View commit details
    Browse the repository at this point in the history

  2. .ci/retrofit-worktree.sh: New, factored out from .github/workflows/bu… 

    …ild*.yml
    @mkoeppe
    mkoeppe committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f429993 View commit details
    Browse the repository at this point in the history

  3. src/tox.ini (pyright): Remove old version pin, do not rely on global … 

    …node installation
    @mkoeppe
    mkoeppe committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    47f6a98 View commit details
    Browse the repository at this point in the history

  4. .github/workflows/build.yml: Simplify use of pyright by going through… 

    … 'sage -tox'
    @mkoeppe
    mkoeppe committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    47e2783 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Fixup

    @mkoeppe
    mkoeppe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    94c8b88 View commit details
    Browse the repository at this point in the history

  2. src/tox.ini (pyright): Do not restrict to subdirectories by default

    @mkoeppe
    mkoeppe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    8bf3bcb View commit details
    Browse the repository at this point in the history

  3. src/tox.ini (pyright): Pin to 1.1.331 (latest)

    @mkoeppe
    mkoeppe committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    81e1afa View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. conda: Do not pin setuptools, instead add legacy editable to install … 

    …instructions
    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    e3dce3f View commit details
    Browse the repository at this point in the history

  2. build/pkgs/setuptools_wheel: Make distros a symlink too

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    c60de9a View commit details
    Browse the repository at this point in the history

  3. src/doc/en/installation/conda.rst: Restore 'bootstrap' in instruction… 

    …s, lost in sagemath#36367
    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    756e5c4 View commit details
    Browse the repository at this point in the history

  4. pkgs/sage-conf_conda/setup.py: Always run configure

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ddbbdc5 View commit details
    Browse the repository at this point in the history

  5. pkgs/sage-conf_conda/setup.py: Remove 'reusing configured SAGE_ROOT' … 

    …message
    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    d0cae80 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'tox_pyright_update' into ci_streamline

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    c555723 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'conda_legacy_editable' into ci_streamline

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    19f029b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'bootstrap_conda_refactor' into ci_streamline

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    68e9997 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'gh_actions_release' into ci_streamline

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    66a8be4 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ci_refactor_build' into ci_streamline

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2e11b0f View commit details
    Browse the repository at this point in the history

  11. build/bin/write-dockerfile.sh, tox.ini (docker-incremental): Make inc… 

    …remental build more incremental via git, via git, .ci/retrofit-worktree.sh
    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    0bfb487 View commit details
    Browse the repository at this point in the history

  12. .github/workflows/build.yml: Merge doc-build.yml, doc-build-pdf.yml

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    8e25cbd View commit details
    Browse the repository at this point in the history

  13. .github/workflows/build.yml: Merge ci-linux-incremental.yml

    @mkoeppe
    mkoeppe committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    459da44 View commit details
    Browse the repository at this point in the history