Skip to content

Commit

Permalink
Merge pull request #45 from casacore/prepare_for_release_and_fix_ci
Browse files Browse the repository at this point in the history
bump version number, fix CI
  • Loading branch information
gijzelaerr authored Jan 14, 2022
2 parents 3acc257 + 07cae13 commit 0a07999
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 168 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: ci

on:
push:
branches:
- 'master'
tags:
- '*'
pull_request:
branches:
- 'master'

jobs:
docker:
runs-on: ubuntu-latest
strategy:
matrix:
compiler: [gcc, clang]
steps:
-
name: Checkout
uses: actions/checkout@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
push: false
file: docker/${{ matrix.compiler }}.docker
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

70 changes: 0 additions & 70 deletions .travis/clang.docker

This file was deleted.

67 changes: 0 additions & 67 deletions .travis/gcc.docker

This file was deleted.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.8)

# project version
set( ${PROJECT_NAME}_MAJOR_VERSION 1 )
set( ${PROJECT_NAME}_MINOR_VERSION 7 )
set( ${PROJECT_NAME}_MINOR_VERSION 8 )
set( ${PROJECT_NAME}_PATCH_LEVEL 0 )

if (UseCasaNamespace)
Expand All @@ -54,7 +54,7 @@ include (CTest)

# Determine which external packages to use.
# dependencies
find_package(CasaCore 3.2 REQUIRED)
find_package(CasaCore 3.4 REQUIRED)
find_package(CFITSIO 3.030 REQUIRED) # Should pad to three decimal digits
find_package(WCSLIB 4.7 REQUIRED) # needed for CASA
find_package(BLAS REQUIRED)
Expand Down
22 changes: 4 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ To compile casarest you need to meet the following requirements:

* cmake
* g++
* casacore (3.0 or later)
* casacore (3.4 or later)
* boost
* wcslib
* cfitsio
* fortran
* hdf5 (optional)

If you are still at casacore 2.0 then use casarest 1.4.2.


On Debian / Ubuntu you can install these with:
```
Expand Down Expand Up @@ -76,27 +74,15 @@ cmake -DCOMPONENT=<choice of target> -P cmake_install.cmake
Which will build and install only your choice of target.


## Ubuntu 14.04 packages

If you run Ubuntu 14.04 you can use precompiled binary packages
## KERN packages

https://launchpad.net/~radio-astro/+archive/ubuntu/main
If you run Ubuntuyou can use precompiled binary packages

installation commands:
```
sudo apt-get install software-properties-common
sudo add-apt-repository ppa:radio-astro/main
sudo apt-get update
sudo apt-get install casarest
```
https://kernsuite.info/


# Problems & bugs

If you have any issues compiling or using casacore, please open an issue on
the issue tracker on github.


# travis

[![Build Status](https://travis-ci.org/casacore/casarest.svg?branch=master)](https://travis-ci.org/casacore/casarest)
32 changes: 32 additions & 0 deletions docker/clang.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM kernsuite/base:7
RUN docker-apt-install \
build-essential \
clang \
cmake \
casacore-dev \
libhdf5-dev \
libboost-all-dev \
wcslib-dev \
libcfitsio-dev \
libboost-system-dev \
libboost-thread-dev \
libblas-dev \
liblapack-dev \
libncurses5-dev \
libmysofa-dev \
bison \
libbison-dev \
flex \
libreadline6-dev \
gfortran

ADD . /code
RUN mkdir /code/build
WORKDIR /code/build
RUN cmake .. \
-DBUILD_TESTING=ON \
-DCMAKE_C_COMPILER=/usr/bin/clang \
-DCMAKE_CXX_COMPILER=/usr/bin/clang++
RUN make -j 4
RUN make test
RUN make install
29 changes: 29 additions & 0 deletions docker/gcc.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM kernsuite/base:7

RUN docker-apt-install \
build-essential \
cmake \
casacore-dev \
libhdf5-dev \
libboost-all-dev \
wcslib-dev \
libcfitsio-dev \
libboost-system-dev \
libboost-thread-dev \
libblas-dev \
liblapack-dev \
libncurses5-dev \
libmysofa-dev \
bison \
libbison-dev \
flex \
libreadline6-dev \
gfortran

ADD . /code
RUN mkdir /code/build
WORKDIR /code/build
RUN cmake .. -DBUILD_TESTING=ON
RUN make -j 4
RUN make test
RUN make install

0 comments on commit 0a07999

Please sign in to comment.