Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Loop3D/map2loop into fix-…
Browse files Browse the repository at this point in the history
…-issue-138
  • Loading branch information
AngRodrigues committed Jan 7, 2025
2 parents add4692 + 1760a90 commit bcc7f08
Show file tree
Hide file tree
Showing 24 changed files with 543 additions and 447 deletions.
316 changes: 0 additions & 316 deletions .github/workflows/CD.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build conda packages

on:
workflow_dispatch:

jobs:
build_wheels:
name: Build wheels on
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ${{ fromJSON(vars.BUILD_OS)}}
python-version: ${{ fromJSON(vars.PYTHON_VERSIONS)}}
steps:
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@v4
- name: update submodules
run: |
git submodule update --init --recursive
- name: Conda build
env:
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
shell: bash -l {0}
run: |
conda install -c conda-forge conda-build scikit-build-core numpy anaconda-client conda-libmamba-solver -y
conda build -c conda-forge -c loop3d --output-folder conda conda --python ${{matrix.python-version}}
anaconda upload --label main conda/*/*.tar.bz2
- name: upload artifacts
uses: actions/upload-artifact@v4
with:
name: conda-build-${{matrix.os}}-${{ matrix.python-version }}
path: conda
10 changes: 6 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ name: Build and Deploy Documentation
on:
workflow_dispatch:



jobs:
documentation-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}

- run: |
cp CHANGELOG.md docs/source/CHANGELOG.md
docker build . -t=docs -f docs/Dockerfile
Expand All @@ -19,8 +20,9 @@ jobs:
with:
name: docs
path: docs/build/html

documentation-deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: GitHub.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit bcc7f08

Please sign in to comment.