Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into filters/relaxation-…
Browse files Browse the repository at this point in the history
…dart-throwing
  • Loading branch information
hobu committed Oct 5, 2020
2 parents b3f9bd6 + 4b59422 commit 97982f6
Show file tree
Hide file tree
Showing 364 changed files with 4,819 additions and 18,010 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Alpine

on:
push:
branches: '*'

#
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: true
container: pdal/alpinebase:latest
steps:
- uses: actions/checkout@v2
- name: Setup
shell: bash -l {0}
run: |
source ./scripts/ci/alpine/setup.sh
- name: CMake
shell: bash -l {0}
run: |
source ../scripts/ci/alpine/cmake.sh
working-directory: ./build

- name: Compile
shell: bash -l {0}
run: |
source ../scripts/ci/alpine/compile.sh
working-directory: ./build

- name: Test
shell: bash -l {0}
run: |
source ../scripts/ci/alpine/test.sh
working-directory: ./build

- name: Examples
shell: bash -l {0}
run: |
source ./scripts/ci/alpine/examples.sh
49 changes: 49 additions & 0 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Conda

on:
push:
branches: '*'

jobs:
build:
name: Conda ${{ matrix.platform }}

runs-on: ${{ matrix.platform }}
strategy:
fail-fast: true
matrix:
platform: ['ubuntu-latest','windows-latest','macos-latest']

env:
PLATFORM: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v2

- uses: goanpeca/setup-miniconda@v1
with:
channels: conda-forge
auto-update-conda: true

- name: Setup
shell: bash -l {0}
run: |
source ./scripts/ci/conda/setup.sh
- name: Build
shell: bash -l {0}
run: |
source ../scripts/ci/conda/compile.sh
working-directory: ./pdal-feedstock

- uses: ilammy/msvc-dev-cmd@v1
if: matrix.platform == 'windows-latest'
- name: Test
shell: bash -l {0}
run: |
source ./scripts/ci/conda/examples.sh
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.platform }}-conda-package
path: ./pdal-feedstock/packages/
58 changes: 58 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Docker

on:
push:
branches: '*'
workflow_dispatch:

# adapted from https://raw.githubusercontent.com/stefanprodan/podinfo/master/.github/workflows/release.yml
#
jobs:
containers:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
with:
version: latest
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Prepare
id: prep
run: |
VERSION=sha-${GITHUB_SHA::8}
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF/refs\/tags\//}
fi
echo ::set-output name=BUILD_DATE::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=VERSION::${VERSION}
- name: Build image
uses: docker/build-push-action@v2
with:
push: true
builder: ${{ steps.buildx.outputs.name }}
context: .
file: ./scripts/docker/ubuntu/Dockerfile
platforms: linux/amd64
tags: |
docker.io/pdal/pdal:${{ steps.prep.outputs.VERSION }}
ghcr.io/pdal/pdal:${{ steps.prep.outputs.VERSION }}
labels: |
org.opencontainers.image.title=${{ github.event.repository.name }}
org.opencontainers.image.description=${{ github.event.repository.description }}
org.opencontainers.image.source=${{ github.event.repository.html_url }}
org.opencontainers.image.url=${{ github.event.repository.html_url }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
org.opencontainers.image.created=${{ steps.prep.outputs.BUILD_DATE }}
11 changes: 9 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Docs
on:
push:
branches: '*'
pull_request:
branches: '*'

jobs:
docs:
Expand Down Expand Up @@ -60,4 +58,13 @@ jobs:
name: Misspelled
path: doc/build/spelling/output.txt

- name: Deploy docs
env:
API_TOKEN_GITHUB: ${{ secrets.DOCS_SECRET_KEY}}
shell: bash -l {0}
if: contains(github.ref, '2.2-maintenance')

run: |
./scripts/ci/docs/deploy_website.sh
53 changes: 53 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Linux

on:
push:
branches: '*'

jobs:
build:
name: Linux ${{ matrix.type }}

runs-on: 'ubuntu-latest'
strategy:
fail-fast: true
matrix:
type: ['floating','fixed']
env:
BUILD_TYPE: ${{ matrix.type }}

steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@v1
with:
channels: conda-forge
auto-update-conda: true

- name: Setup
shell: bash -l {0}
run: |
source ./scripts/ci/linux/setup.sh
- name: CMake
shell: bash -l {0}
run: |
source ../scripts/ci/linux/cmake.sh
working-directory: ./build

- name: Compile
shell: bash -l {0}
run: |
source ../scripts/ci/linux/compile.sh
working-directory: ./build

- name: Test
shell: bash -l {0}
run: |
source ../scripts/ci/linux/test.sh
working-directory: ./build

- name: Examples
shell: bash -l {0}
run: |
source ./scripts/ci/linux/examples.sh
53 changes: 53 additions & 0 deletions .github/workflows/osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: OSX

on:
push:
branches: '*'

jobs:
build:
name: OSX

runs-on: 'macos-latest'
strategy:
fail-fast: true
matrix:
type: ['floating','fixed']
env:
BUILD_TYPE: ${{ matrix.type }}

steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@v1
with:
channels: conda-forge
auto-update-conda: true

- name: Setup
shell: bash -l {0}
run: |
source ./scripts/ci/osx/setup.sh
- name: CMake
shell: bash -l {0}
run: |
source ../scripts/ci/osx/cmake.sh
working-directory: ./build

- name: Compile
shell: bash -l {0}
run: |
source ../scripts/ci/osx/compile.sh
working-directory: ./build

- name: Test
shell: bash -l {0}
run: |
source ../scripts/ci/osx/test.sh
working-directory: ./build

- name: Examples
shell: bash -l {0}
run: |
source ./scripts/ci/osx/examples.sh
56 changes: 56 additions & 0 deletions .github/workflows/win.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Windows

on:
push:
branches: '*'

jobs:
build:
name: MSVC

runs-on: 'windows-latest'
strategy:
fail-fast: true
matrix:
type: ['floating','fixed']
env:
BUILD_TYPE: ${{ matrix.type }}

steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
- uses: goanpeca/setup-miniconda@v1
with:
channels: conda-forge
auto-update-conda: true
python-version: '3.8'

- name: Setup
shell: bash -l {0}
run: |
source ./scripts/ci/win/setup.sh
- name: CMake
shell: bash -l {0}
working-directory: ./build
run: |
source ../scripts/ci/win/cmake.sh
- name: Compile
shell: bash -l {0}
working-directory: ./build
run: |
source ../scripts/ci/win/compile.sh
- name: Test
shell: bash -l {0}
working-directory: ./build
run: |
source ../scripts/ci/win/test.sh
- name: Examples
shell: bash -l {0}
run: |
source ./scripts/ci/win/examples.sh
37 changes: 0 additions & 37 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

cmake_minimum_required(VERSION 3.5)

project(PDAL VERSION 2.1.0 LANGUAGES CXX C)
project(PDAL VERSION 2.2.0 LANGUAGES CXX C)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)

set(ROOT_DIR "${PROJECT_SOURCE_DIR}")
Expand Down
4 changes: 2 additions & 2 deletions HOWTORELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ Release Process
git push origin 2.0-maintenance


- Increment the doc build branch of .travis.yml:
- Increment the doc build branch of .github/workflows/docs.yml:

"$TRAVIS_BRANCH" = "2.0-maintenance"
if: github.ref == 'refs/heads/2.2-maintenance'

- Make DockerHub build entry for new release branch.

Expand Down

0 comments on commit 97982f6

Please sign in to comment.