Skip to content

Commit

Permalink
Conditional push now in place, now we attempt to make the version wor…
Browse files Browse the repository at this point in the history
…k well
  • Loading branch information
Petter Rønningen committed Apr 20, 2020
1 parent 56582f2 commit 55ccb91
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:

env:
IMAGE_NAME: dlite
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token provided by actions

steps:
- uses: actions/checkout@v1
Expand All @@ -27,8 +28,6 @@ jobs:
- name: Create github docker package
uses: whoan/docker-build-with-cache-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token provided by actions
with:
push_image_and_stages: true
push_git_tag: false
Expand All @@ -42,13 +41,20 @@ jobs:
build_extra_args: "--compress=true"

- name: Push docker image for version tagged commits
uses: whoan/docker-build-with-cache-action@v5
if: startsWith(github.ref, 'v')
run: |
echo "I should now push a tagged version: ${{ github.ref }}"
with:
push_image_and_stages: true
push_git_tag: false
username: jesper-friis
password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com
image_name: sintef/dlite/dlite
image_tag: ${{ github.ref }}
context: .
dockerfile: Dockerfile
build_extra_args: "--compress=true"

# - name: Push docker image for version tagged commits
# if: startsWith(${{ github.ref }}, 'v')
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # token provided by actions
# run: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.11)
include(CPack)

project(dlite
VERSION 0.2.2
VERSION 0.2.2-alpha
#DESCRIPTION "Lightweight library for working with scientific data"
LANGUAGES C
)
Expand Down

0 comments on commit 55ccb91

Please sign in to comment.