Skip to content

Commit

Permalink
Merge pull request #91 from IN-CORE/main
Browse files Browse the repository at this point in the history
Main to develop
  • Loading branch information
ywkim312 authored Dec 13, 2023
2 parents 9e88522 + 5ce34ca commit 23bde88
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
if [ "${{ matrix.name }}" == "hub" ]; then
version=$(grep '"version"' incore_utilities/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/')
else
version=$(grep "ARG INCORE=" Dockerfile.lab | sed 's/.*="\([0-9\.]*\)"$/\1/g')
version=$(awk '/^## / { print tolower($2) }' CHANGELOG.md | head -1 | sed 's/^.//;s/.$//')
fi
tags="latest"
oldversion=""
Expand Down Expand Up @@ -137,10 +137,10 @@ jobs:
run: |
echo "${{ env.TAGS }}"
echo "${{ env.CHANNEL }}"
echo "${{ env.INCORE_VERSION }}"
echo "${{ env.PYINCORE_VERSION }}"
echo "${{ env.PYINCORE_VIZ_VERSION }}"
echo "${{ env.PYINCORE_DATA_VERSION }}"
echo "Incore: ${{ env.INCORE_VERSION }}"
echo "PyIncore: ${{ env.PYINCORE_VERSION }}"
echo "PyIncore-Viz: ${{ env.PYINCORE_VIZ_VERSION }}"
echo "PyIncore-Data: ${{ env.PYINCORE_DATA_VERSION }}"
# setup docker build
- name: Set up QEMU
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased] -
## [1.2.0] - 2023-12-13

### Added

Expand Down
8 changes: 4 additions & 4 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project: "IN-CORE Lab"
author: "Yong Wook Kim"
Channel: "in-core"
# version form must be "x.x.x"
INCORE_VERSION: "4.7.0"
PyIncore: "1.14.0"
PyIncore-Viz: "1.8.4"
PyIncore-Data: "0.6.0"
INCORE_VERSION: "4.8.0"
PyIncore: "1.15.0"
PyIncore-Viz: "1.9.0"
PyIncore-Data: "0.6.1"

0 comments on commit 23bde88

Please sign in to comment.