Skip to content

Commit

Permalink
Merge pull request #190 from LCSB-BioCore/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
laurentheirendt authored May 5, 2021
2 parents a3fb775 + 4e0faa1 commit 5f33ea2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- develop
- master

jobs:
test:
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Publish Docker image

on:
push:
tags:
- "v*"
release:
types: [published, created]

Expand All @@ -11,12 +14,6 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v2
- name: Login to Registry
uses: docker/login-action@v1
with:
registry: docker.pkg.github.com
username: cylon-x
password: ${{ secrets.docker_token }}
- name: Push to GitHub Registry
uses: mr-smithers-excellent/docker-build-push@v5
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- develop
- master
tags: '*'
release:
types: [published, created]
Expand All @@ -16,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: 1.4
version: 1.6
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "GigaSOM"
uuid = "a03a9c34-069e-5582-a11c-5c984cab887c"
version = "0.6.5"
version = "0.6.6"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down

0 comments on commit 5f33ea2

Please sign in to comment.