Skip to content

Commit

Permalink
fix build error, link to docs requ
Browse files Browse the repository at this point in the history
  • Loading branch information
pluflou committed Aug 19, 2024
1 parent 2881b1d commit 9fc7020
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 63 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,16 @@ jobs:
id: condaload
run: |
anaconda upload -u slacgismo /usr/share/miniconda3/conda-bld/noarch/solar-data-tools-${{ steps.condabuild.outputs.gitversion }}-*.tar.bz2
deploy-rtd:
runs-on: ubuntu-latest
needs: [build-pypi, build-conda]
environment: deployment
steps:
# Do not need to build and upload artifacts, just re-trigger to update tags/version on website
- name: Trigger RTDs build
uses: dfm/rtds-action@v1
with:
webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }}
webhook_token: ${{ secrets.RTDS_WEBHOOK_TOKEN }}
commit_ref: ${{ github.ref }}
124 changes: 62 additions & 62 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,71 @@ on:
push:
branches: [dev]
jobs:
# build-pypi:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout Repository
# uses: actions/checkout@v4
#
# - uses: actions/setup-python@v4
# with:
# python-version: "3.10"
#
# - name: Install Twine and Build
# run: sudo pip install twine build
#
# - name: Create the distribution
# run: |
# git fetch --prune --unshallow --tags
# sudo python3 -m build
#
# build-conda:
# runs-on: ubuntu-latest
# # sets default shell to remove need for source to run the conda shell
# defaults:
# run:
# shell: bash -l {0}
# environment: test-deployment
# steps:
# - name: Checkout Repository
# uses: actions/checkout@v3
#
# - uses: actions/setup-python@v4
# with:
# python-version: "3.10"
#
# # Much better than manual installation, original version Miniconda2-4.7.10-Linux-x86_64.sh is broken
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-activate-base: true
# activate-environment: ""
# miniconda-version: "latest"
#
# - name: Install the Conda Dependencies
# run: |
# conda config --set always_yes yes --set auto_update_conda false
# conda update conda
# conda install -n base conda-libmamba-solver
# conda install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich jsonschema -c conda-forge
# git fetch --prune --unshallow --tags
# pip install -e .
#
# # echo yes before login to prevent anaconda bug breaking automation
# # git tags MUST be fetched otherwise output will be blank
# # bash variables cannot be used in github actions, must use actions specific syntax and methods
# # channels need to be specified on build and are saved in the package for installs
# - name: Build the Anaconda Package
# id: condabuild
# run: |
# conda install anaconda-client
# conda clean --all
# conda config --set anaconda_upload no --set solver libmamba
# VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c slacgismo -c conda-forge -c stanfordcvxgrp --numpy 2.0
# echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
build-pypi:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
python-version: "3.10"

- name: Install Twine and Build
run: sudo pip install twine build

- name: Create the distribution
run: |
git fetch --prune --unshallow --tags
sudo python3 -m build
build-conda:
runs-on: ubuntu-latest
# sets default shell to remove need for source to run the conda shell
defaults:
run:
shell: bash -l {0}
environment: test-deployment
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: "3.10"

# Much better than manual installation, original version Miniconda2-4.7.10-Linux-x86_64.sh is broken
- uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
activate-environment: ""
miniconda-version: "latest"

- name: Install the Conda Dependencies
run: |
conda config --set always_yes yes --set auto_update_conda false
conda update conda
conda install -n base conda-libmamba-solver
conda install python=3.10 conda-build colorama pip ruamel ruamel.yaml rich jsonschema -c conda-forge
git fetch --prune --unshallow --tags
pip install -e .
# echo yes before login to prevent anaconda bug breaking automation
# git tags MUST be fetched otherwise output will be blank
# bash variables cannot be used in github actions, must use actions specific syntax and methods
# channels need to be specified on build and are saved in the package for installs
- name: Build the Anaconda Package
id: condabuild
run: |
conda install anaconda-client
conda clean --all
conda config --set anaconda_upload no --set solver libmamba
VERSION_FROM_GIT_TAG=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)test conda build . -c mosek -c slacgismo -c conda-forge -c stanfordcvxgrp --numpy 2.0
echo "gitversion=$(git tag --list "v*[0-9]" --sort=version:refname | tail -1 | cut -c 2-)" >> $GITHUB_OUTPUT
deploy-rtd:
runs-on: ubuntu-latest
#needs: [build-pypi, build-conda]
needs: [build-pypi, build-conda]
environment: test-deployment
steps:
# Do not need to build and upload artifacts, just re-trigger to update tags/version on website
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sphinx:
# Then, install special pinning for RTD.
python:
install:
- requirements: requirements.txt
- requirements: docs/requirements.txt
- method: pip
path: .

0 comments on commit 9fc7020

Please sign in to comment.