-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from wtsi-npg/devel
Merge devel to master for release
- Loading branch information
Showing
6 changed files
with
180 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "gomod" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| name: "Unit tests" | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-18.04 | ||
| continue-on-error: ${{ matrix.experimental }} # Experimental builds may fail | ||
|
|
||
| defaults: | ||
| run: | ||
| shell: bash -l -e -o pipefail {0} | ||
|
|
||
| env: | ||
| WSI_CONDA_CHANNEL: "https://dnap.cog.sanger.ac.uk/npg/conda/devel/generic" | ||
| CONDA_TEST_ENVIRONMENT: "testenv" | ||
|
|
||
| strategy: | ||
| matrix: | ||
| go: [ "1.16" ] | ||
| baton: [ "2.1.0" ] | ||
| experimental: [false] | ||
| include: | ||
| - irods: "4.2.7" | ||
| server_image: "wsinpg/ub-16.04-irods-4.2.7:latest" | ||
| experimental: false | ||
| - irods: "4.2.8" | ||
| server_image: "wsinpg/ub-18.04-irods-4.2.8:latest" | ||
| experimental: true | ||
|
|
||
| services: | ||
| irods: | ||
| image: ${{ matrix.server_image }} | ||
| ports: | ||
| - 1247:1247 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: "Set up Go ${{ matrix.go }}" | ||
| uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: ${{ matrix.go }} | ||
|
|
||
| - name: "Initialize Miniconda" | ||
| run: | | ||
| echo 'source $CONDA/etc/profile.d/conda.sh' >> "$HOME/.bash_profile" | ||
| - name: "Configure Miniconda" | ||
| run: | | ||
| conda config --prepend pkgs_dirs "$HOME/conda/pkgs" | ||
| conda config --prepend envs_dirs "$HOME/conda/envs" | ||
| conda config --set auto_update_conda False | ||
| conda config --prepend channels "$WSI_CONDA_CHANNEL" | ||
| conda config --append channels conda-forge | ||
| conda info | ||
| - name: "Install iRODS clients" | ||
| run: | | ||
| conda create -y -n "$CONDA_TEST_ENVIRONMENT" | ||
| conda install -y -n "$CONDA_TEST_ENVIRONMENT" "irods-icommands ==${{ matrix.irods }}" | ||
| conda install -y -n "$CONDA_TEST_ENVIRONMENT" "baton ==${{ matrix.baton }}" | ||
| - name: "Configure iRODS clients" | ||
| run: | | ||
| conda activate "$CONDA_TEST_ENVIRONMENT" | ||
| mkdir -p "$HOME/.irods" | ||
| cat <<'EOF' > "$HOME/.irods/irods_environment.json" | ||
| { | ||
| "irods_host": "localhost", | ||
| "irods_port": 1247, | ||
| "irods_user_name": "irods", | ||
| "irods_zone_name": "testZone", | ||
| "irods_home": "/testZone/home/irods", | ||
| "irods_default_resource": "testResc" | ||
| } | ||
| EOF | ||
| echo "irods" | script -q -c "iinit" /dev/null | ||
| ienv | ||
| ils | ||
| baton-do --version | ||
| - name: "Cache Go modules" | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| "$HOME/go/pkg/mod" | ||
| "$HOME/.cache/go-build" | ||
| key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-go- | ||
| - name: "Install test runner" | ||
| run: | | ||
| go get github.com/onsi/ginkgo/ginkgo | ||
| go get github.com/onsi/gomega/... | ||
| - name: "Run tests" | ||
| run: | | ||
| conda activate "$CONDA_TEST_ENVIRONMENT" | ||
| make test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| module github.com/wtsi-npg/extendo/v2 | ||
|
|
||
| go 1.14 | ||
| go 1.16 | ||
|
|
||
| require ( | ||
| github.com/onsi/ginkgo v1.15.0 | ||
| github.com/onsi/gomega v1.10.5 | ||
| github.com/pkg/errors v0.8.1 | ||
| github.com/rs/zerolog v1.19.0 | ||
| github.com/onsi/ginkgo v1.16.1 | ||
| github.com/onsi/gomega v1.11.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/rs/zerolog v1.21.0 | ||
| github.com/stretchr/testify v1.7.0 | ||
| github.com/wtsi-npg/logshim v1.2.0 | ||
| github.com/wtsi-npg/logshim-zerolog v1.2.0 | ||
| github.com/wtsi-npg/logshim v1.3.0 | ||
| github.com/wtsi-npg/logshim-zerolog v1.3.0 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters