From b13403909cc1a537e3031d3d58142700856156af Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:26:27 -0700 Subject: [PATCH 01/54] Test of new deploy release --- .github/workflows/deploy-dev-release.yml | 41 ++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 65939b9..dd71b55 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -1,3 +1,14 @@ +######################################################################################################## +# Deploys a develop release and commits pyproject.toml files with new versions. +# +# When will it run: +# This workflow will only run on push to develop when there is a python file change. +# +# How will it update: +# The script should update based upon the current version in the pyproject.toml file. The workflow +# should run poetry version prerelease to create a new version file. Since this +# repository houses multiple wheels we will be using the ./scripts/runoneach.sh to run this command. +######################################################################################################## name: Deploy Dev Release Artifacts on: @@ -31,17 +42,27 @@ jobs: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - run: echo "The specified version is ${{ inputs.release-version }}." #---------------------------------------------- # check-out repo and set-up python #---------------------------------------------- - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # ref: develop token: ${{ secrets.GITHUB_TOKEN }} + - name: Set SHOULD_UPDATE_VERSION environmental variable + id: should_update_version + run: | + if ! $(git diff-index --name-only HEAD | grep "*.py") = ''; then + echo "::set-output name=value::false" + else + echo "::set-output name=value::true" + fi + - name: Set up Python ${{ env.PYTHON_VERSION }} id: setup-python uses: actions/setup-python@v4 @@ -52,7 +73,7 @@ jobs: # ----- install & configure poetry ----- #---------------------------------------------- - name: Install Poetry - uses: snok/install-poetry@v1.3.3 + uses: snok/install-poetry@v1 with: virtualenvs-create: true virtualenvs-in-project: true @@ -75,11 +96,27 @@ jobs: # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' # run: poetry install --no-interaction --no-root + - name: Update version if necessary + if: ${{ steps.should_update_version.output.value == true}} + run: | + echo "Running update pyproject." + exit 1 + - name: Not running update + if: ${{ steps.should_update_version.output.value == false}} + run: | + echo "Not running update pyproject" + exit 1 + #---------------------------------------------- # install your root project, if required #---------------------------------------------- - name: Install library run: | + + if ! $(git diff-index --name-only HEAD | grep "*.py") = ''; then + + else + ./scripts/run_on_each.sh poetry version prerelease ./scripts/poetry_install.sh # git checkout develop From 7cb423113d00477c25a0a0fe6e5074235d452589 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:33:02 -0700 Subject: [PATCH 02/54] Test of new deploy release --- .github/workflows/deploy-dev-release.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index dd71b55..2c717f1 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -17,11 +17,17 @@ on: - develop workflow_dispatch: inputs: - release-version: - description: "Version number to use. If provided bump-rule will be ignored" + upgrade-version: + description: "Upgrade version number regardless of whether a py file is altered." required: false - default: "" - type: string + default: false + type: boolean +# +# release-version: +# description: "Version number to use. If provided bump-rule will be ignored" +# required: false +# default: "" +# type: string defaults: run: @@ -57,10 +63,10 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - if ! $(git diff-index --name-only HEAD | grep "*.py") = ''; then - echo "::set-output name=value::false" - else + if $(git diff-index --name-only HEAD | grep "*.py") = '' or ${{ inputs.upgrade-version == true }} ; then echo "::set-output name=value::true" + else + echo "::set-output name=value::false" fi - name: Set up Python ${{ env.PYTHON_VERSION }} From 8adf690d20403edc66f42b91f839d51f03176360 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:45:11 -0700 Subject: [PATCH 03/54] Test of new deploy release --- .github/workflows/deploy-dev-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 2c717f1..27f39f1 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -64,9 +64,9 @@ jobs: id: should_update_version run: | if $(git diff-index --name-only HEAD | grep "*.py") = '' or ${{ inputs.upgrade-version == true }} ; then - echo "::set-output name=value::true" + echo "value=true" >> $GITHUB_OUTPUT else - echo "::set-output name=value::false" + echo "value=false" >> $GITHUB_OUTPUT fi - name: Set up Python ${{ env.PYTHON_VERSION }} @@ -119,7 +119,7 @@ jobs: - name: Install library run: | - if ! $(git diff-index --name-only HEAD | grep "*.py") = ''; then + if ! $(git diff-index --name-only HEAD | grep "*.py") == ''; then else ./scripts/run_on_each.sh poetry version prerelease From 4f6847ac64566e4eda58f85d1b690f6540cf83bc Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:56:38 -0700 Subject: [PATCH 04/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 27f39f1..d070f5c 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,7 +63,9 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - if $(git diff-index --name-only HEAD | grep "*.py") = '' or ${{ inputs.upgrade-version == true }} ; then + has_python_code=$(git diff-index --name-only HEAD | grep "*.py") + + if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> $GITHUB_OUTPUT else echo "value=false" >> $GITHUB_OUTPUT From 45c69f82283c4252a08a98377aacc9e6eb85aa37 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:57:51 -0700 Subject: [PATCH 05/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index d070f5c..1bb9f55 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,7 +63,7 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - has_python_code=$(git diff-index --name-only HEAD | grep "*.py") + has_python_code=$(git diff-index --name-only HEAD | grep ".py") if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> $GITHUB_OUTPUT From a6025020b889ca23479dae36891d227b0bb53e2a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:03:23 -0700 Subject: [PATCH 06/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 1bb9f55..8f3a578 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -66,9 +66,9 @@ jobs: has_python_code=$(git diff-index --name-only HEAD | grep ".py") if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then - echo "value=true" >> $GITHUB_OUTPUT + echo "value=true" >> "$GITHUB_OUTPUT" else - echo "value=false" >> $GITHUB_OUTPUT + echo "value=false" >> "$GITHUB_OUTPUT" fi - name: Set up Python ${{ env.PYTHON_VERSION }} @@ -105,12 +105,12 @@ jobs: # run: poetry install --no-interaction --no-root - name: Update version if necessary - if: ${{ steps.should_update_version.output.value == true}} + if: ${{ steps.should_update_version.outputs.value == true}} run: | echo "Running update pyproject." exit 1 - name: Not running update - if: ${{ steps.should_update_version.output.value == false}} + if: ${{ steps.should_update_version.outputs.value == false}} run: | echo "Not running update pyproject" exit 1 From 4792a055cd0667458cfde5ec26ba002e72c17f85 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:05:19 -0700 Subject: [PATCH 07/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 8f3a578..2857638 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,9 +63,10 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - has_python_code=$(git diff-index --name-only HEAD | grep ".py") + has_python_code=$(git diff-index --name-only HEAD | grep '.py') + echo "Has python code is ${{ has_pythonh_code }}" - if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then + if [[ ${{ has_python_code }} != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From 8e1f88cafc56dee4c3ad8380f7efd87b68d899bf Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:06:16 -0700 Subject: [PATCH 08/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 2857638..d95c9ff 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -64,7 +64,7 @@ jobs: id: should_update_version run: | has_python_code=$(git diff-index --name-only HEAD | grep '.py') - echo "Has python code is ${{ has_pythonh_code }}" + echo "Has python code is ${{ has_python_code }}" if [[ ${{ has_python_code }} != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" From 675fb154d14737c4808438989ec2572312b3f051 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:07:17 -0700 Subject: [PATCH 09/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index d95c9ff..054df3c 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -66,7 +66,7 @@ jobs: has_python_code=$(git diff-index --name-only HEAD | grep '.py') echo "Has python code is ${{ has_python_code }}" - if [[ ${{ has_python_code }} != '' || ${{ inputs.upgrade-version == true }} ]] ; then + if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From af4ab69af3d9e12d6717960e64faff3f4eb1f3b5 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:09:51 -0700 Subject: [PATCH 10/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 054df3c..b280500 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,6 +63,10 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | + set -x + set -u + set -e + has_python_code=$(git diff-index --name-only HEAD | grep '.py') echo "Has python code is ${{ has_python_code }}" From 483818e3facc7c3ad1e5095d10bd13372f1a1a96 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:17:54 -0700 Subject: [PATCH 11/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index b280500..d31efa5 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -68,7 +68,7 @@ jobs: set -e has_python_code=$(git diff-index --name-only HEAD | grep '.py') - echo "Has python code is ${{ has_python_code }}" + echo "Has python code is $has_python_code" if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" From 5bd4a788919bddcfdc837171e06efcb4c49ea623 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:23:56 -0700 Subject: [PATCH 12/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index d31efa5..538240e 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -67,10 +67,10 @@ jobs: set -u set -e - has_python_code=$(git diff-index --name-only HEAD | grep '.py') + has_python_code="$(git diff-index --name-only HEAD | grep '.py')" echo "Has python code is $has_python_code" - if [[ $has_python_code != '' || ${{ inputs.upgrade-version == true }} ]] ; then + if [[ $has_python_code || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From ec81c46948e00c54d4e7e4219f96a4c47c238e2c Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:27:14 -0700 Subject: [PATCH 13/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 538240e..c008dcd 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -67,10 +67,7 @@ jobs: set -u set -e - has_python_code="$(git diff-index --name-only HEAD | grep '.py')" - echo "Has python code is $has_python_code" - - if [[ $has_python_code || ${{ inputs.upgrade-version == true }} ]] ; then + if [[ $(git diff-index --name-only HEAD | grep '.py') || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From b6d81ae1f604a14a47bda7d3f14be5035bc8d62a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:29:13 -0700 Subject: [PATCH 14/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index c008dcd..6b4ce88 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -107,12 +107,12 @@ jobs: # run: poetry install --no-interaction --no-root - name: Update version if necessary - if: ${{ steps.should_update_version.outputs.value == true}} + if: ${{ steps.should_update_version.outputs.value }} run: | echo "Running update pyproject." exit 1 - name: Not running update - if: ${{ steps.should_update_version.outputs.value == false}} + if: ${{ ! steps.should_update_version.outputs.value }} run: | echo "Not running update pyproject" exit 1 @@ -123,9 +123,6 @@ jobs: - name: Install library run: | - if ! $(git diff-index --name-only HEAD | grep "*.py") == ''; then - - else ./scripts/run_on_each.sh poetry version prerelease ./scripts/poetry_install.sh From b6476cc70f3b9fc23274b9a9a23a83dd3606d8b7 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:32:15 -0700 Subject: [PATCH 15/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 6b4ce88..149c3d4 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -107,13 +107,15 @@ jobs: # run: poetry install --no-interaction --no-root - name: Update version if necessary - if: ${{ steps.should_update_version.outputs.value }} + if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | + echo "State is ${{ steps.should_update_version.outputs.value }}" echo "Running update pyproject." exit 1 - name: Not running update - if: ${{ ! steps.should_update_version.outputs.value }} + if: ${{ steps.should_update_version.outputs.value != 'true' }} run: | + echo "State is ${{ steps.should_update_version.outputs.value }}" echo "Not running update pyproject" exit 1 From 9c6cf7a40b0960ae883024704d4a1942509a866e Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:41:29 -0700 Subject: [PATCH 16/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 149c3d4..e648305 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -67,7 +67,9 @@ jobs: set -u set -e - if [[ $(git diff-index --name-only HEAD | grep '.py') || ${{ inputs.upgrade-version == true }} ]] ; then + [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false + + if [[ ${{ has_python_code }} || ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From bdf2268c6f1df20ee4c7fb2f2e111d1a296778e4 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:43:04 -0700 Subject: [PATCH 17/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index e648305..dc697ea 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -69,7 +69,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - if [[ ${{ has_python_code }} || ${{ inputs.upgrade-version == true }} ]] ; then + if [ $has_python_code || ${{ inputs.upgrade-version == true }} ] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From 4da6193a5bfade4c33617be3e9882ba56c143678 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:46:23 -0700 Subject: [PATCH 18/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index dc697ea..350eb48 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -77,7 +77,7 @@ jobs: - name: Set up Python ${{ env.PYTHON_VERSION }} id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} From a4d6eaed40e1ca8f4b886b166cfffb5743ada409 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:48:09 -0700 Subject: [PATCH 19/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 3a36d69..1f81bbb 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -54,3 +54,4 @@ from gridappsd.difference_builder import DifferenceBuilder from gridappsd.app_registration import ApplicationController import gridappsd.json_extension as json + From 9c4331af4fca5263bef0792f1ed71bc0d554141c Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:49:56 -0700 Subject: [PATCH 20/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 350eb48..29d284f 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -69,7 +69,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - if [ $has_python_code || ${{ inputs.upgrade-version == true }} ] ; then + if [[ $has_python_code ] || [ ${{ inputs.upgrade-version == true }} ]] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From 50237b4e2a97d8444da2ed0502ede93586a42240 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:50:11 -0700 Subject: [PATCH 21/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 1f81bbb..e57c6ab 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -55,3 +55,4 @@ from gridappsd.app_registration import ApplicationController import gridappsd.json_extension as json + From 30e46ec9718d875c2e72a0ea531b26681d646500 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:53:21 -0700 Subject: [PATCH 22/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 29d284f..336a80f 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -69,7 +69,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - if [[ $has_python_code ] || [ ${{ inputs.upgrade-version == true }} ]] ; then + if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then echo "value=true" >> "$GITHUB_OUTPUT" else echo "value=false" >> "$GITHUB_OUTPUT" From a8508b15eaaa963b1d1eb48b842377d60ec74ff9 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:53:38 -0700 Subject: [PATCH 23/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index e57c6ab..51be28a 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -46,6 +46,7 @@ import pathlib import typing + StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From eb8db923e8a46003922789b5ce7d5344d6af6801 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:58:30 -0700 Subject: [PATCH 24/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 51be28a..e57c6ab 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -46,7 +46,6 @@ import pathlib import typing - StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From a7ad0f06db97eb3a7bee29b3c01ecc018726f4bb Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:09:52 -0700 Subject: [PATCH 25/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 336a80f..79e2e23 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,17 +63,19 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - set -x + # set -x set -u set -e [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then - echo "value=true" >> "$GITHUB_OUTPUT" - else - echo "value=false" >> "$GITHUB_OUTPUT" - fi + echo "value=${{ has_python_code }} >> "$GITHUB_OUTPUT" + +# if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then +# echo "value=true" >> "$GITHUB_OUTPUT" +# else +# echo "value=false" >> "$GITHUB_OUTPUT" +# fi - name: Set up Python ${{ env.PYTHON_VERSION }} id: setup-python From 597dd8e3f8fa77ed783b54230d55c764c662f1f7 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:12:08 -0700 Subject: [PATCH 26/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index e57c6ab..51be28a 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -46,6 +46,7 @@ import pathlib import typing + StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From f519f698c62b6f1df6a3117753638d0e09e85725 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:20:42 -0700 Subject: [PATCH 27/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 79e2e23..06626fb 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -69,7 +69,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - echo "value=${{ has_python_code }} >> "$GITHUB_OUTPUT" + echo "value=${has_python_code} >> "$GITHUB_OUTPUT" # if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then # echo "value=true" >> "$GITHUB_OUTPUT" From 3276df2c6762303e5821b069c385fd79dad44342 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:25:19 -0700 Subject: [PATCH 28/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 06626fb..206e795 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -69,7 +69,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - echo "value=${has_python_code} >> "$GITHUB_OUTPUT" + echo "value=${has_python_code}" >> "$GITHUB_OUTPUT" # if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then # echo "value=true" >> "$GITHUB_OUTPUT" From 03a1d98d705dd8e0c235af1432dc3d5477ff2a9d Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:26:26 -0700 Subject: [PATCH 29/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 51be28a..4cfebeb 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -57,3 +57,4 @@ import gridappsd.json_extension as json + From 3f13200ea7345a1f2f541ea3efa2fee85ba5272c Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:27:53 -0700 Subject: [PATCH 30/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 206e795..3965f7b 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -70,6 +70,7 @@ jobs: [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false echo "value=${has_python_code}" >> "$GITHUB_OUTPUT" + echo "value is set to ${has_python_code}" # if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then # echo "value=true" >> "$GITHUB_OUTPUT" From 0d1d6b1443e3623999c76d2812944befe0d44542 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:30:00 -0700 Subject: [PATCH 31/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 4cfebeb..b632718 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -55,6 +55,3 @@ from gridappsd.difference_builder import DifferenceBuilder from gridappsd.app_registration import ApplicationController import gridappsd.json_extension as json - - - From 25a8e5f0d784565ef54342f7552132a3f8d8e350 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:31:56 -0700 Subject: [PATCH 32/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index b632718..03dcc8c 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -47,6 +47,8 @@ import typing + + StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From 554a0070b1a773f319bc079f71f95d8feff13b8a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:33:53 -0700 Subject: [PATCH 33/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 03dcc8c..b632718 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -47,8 +47,6 @@ import typing - - StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From 7976616a21f1f12f9528235381a9ec6274017bdf Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:37:36 -0700 Subject: [PATCH 34/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 3965f7b..34845fb 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -63,13 +63,14 @@ jobs: - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | - # set -x + set -x set -u set -e + echo "$(git diff-index --name-only HEAD | grep '.py')" [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false - echo "value=${has_python_code}" >> "$GITHUB_OUTPUT" + echo "value=$has_python_code" >> "$GITHUB_OUTPUT" echo "value is set to ${has_python_code}" # if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then From 51e5287a3171ab12aeee0c2fc8d2140554c0f551 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:48:43 -0700 Subject: [PATCH 35/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 34845fb..4f87a6a 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -60,6 +60,21 @@ jobs: # ref: develop token: ${{ secrets.GITHUB_TOKEN }} + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v45 + # To compare changes between the current commit and the last pushed remote commit set `since_last_remote_commit: true`. e.g + # with: + # since_last_remote_commit: true + + - name: List all changed files + env: + ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} + run: | + for file in ${ALL_CHANGED_FILES}; do + echo "$file was changed" + done + - name: Set SHOULD_UPDATE_VERSION environmental variable id: should_update_version run: | From e6a84f8f52ae145118a1d42db41c7a81d464a979 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:53:18 -0700 Subject: [PATCH 36/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 4f87a6a..71a9d97 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -66,6 +66,9 @@ jobs: # To compare changes between the current commit and the last pushed remote commit set `since_last_remote_commit: true`. e.g # with: # since_last_remote_commit: true + with: + files: | + **.py - name: List all changed files env: From b1319983ceb13009aa01f115651efcd0f0b35d61 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:55:49 -0700 Subject: [PATCH 37/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 71a9d97..89d2ab9 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -72,9 +72,9 @@ jobs: - name: List all changed files env: - ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} + PYTHON_FILES_CHANGED: ${{ steps.changed-files.outputs.all_changed_files }} run: | - for file in ${ALL_CHANGED_FILES}; do + for file in ${PYTHON_FILES_CHANGED}; do echo "$file was changed" done From 85be6c0ad00fc168a74f410db9eb50ceab9eeedd Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 17:57:09 -0700 Subject: [PATCH 38/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index b632718..ab84216 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -45,8 +45,6 @@ """ import pathlib import typing - - StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From f190f4a9671422aeec47b93bf6990bef64062346 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:02:26 -0700 Subject: [PATCH 39/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 43 +++++++++++++++++------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 89d2ab9..cc2eeff 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -70,26 +70,45 @@ jobs: files: | **.py - - name: List all changed files + - name: Should change version + id: should_update_version env: PYTHON_FILES_CHANGED: ${{ steps.changed-files.outputs.all_changed_files }} - run: | - for file in ${PYTHON_FILES_CHANGED}; do - echo "$file was changed" - done - - - name: Set SHOULD_UPDATE_VERSION environmental variable - id: should_update_version run: | set -x set -u set -e - echo "$(git diff-index --name-only HEAD | grep '.py')" - [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false + should_update=false + for file in ${PYTHON_FILES_CHANGED}; do + should_update=true + break + done + + echo "Should update == ${should_update}" + echo "value=${should_update}" >> "$GITHUB_OUTPUT" - echo "value=$has_python_code" >> "$GITHUB_OUTPUT" - echo "value is set to ${has_python_code}" + +# - name: List all changed files +# env: +# PYTHON_FILES_CHANGED: ${{ steps.changed-files.outputs.all_changed_files }} +# run: | +# for file in ${PYTHON_FILES_CHANGED}; do +# echo "$file was changed" +# done +# +# - name: Set SHOULD_UPDATE_VERSION environmental variable +# id: should_update_version +# run: | +# set -x +# set -u +# set -e +# +# echo "$(git diff-index --name-only HEAD | grep '.py')" +# [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false +# +# echo "value=$has_python_code" >> "$GITHUB_OUTPUT" +# echo "value is set to ${has_python_code}" # if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then # echo "value=true" >> "$GITHUB_OUTPUT" From 7e1712aea7af759d88df1a13e3e3b5047591091f Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:02:49 -0700 Subject: [PATCH 40/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index ab84216..1c3b710 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -47,6 +47,7 @@ import typing StrPath = typing.Union[str, pathlib.Path] + from gridappsd.goss import GOSS from gridappsd.utils import ProcessStatusEnum from gridappsd.gridappsd import GridAPPSD From d8354af0e25d8e86f2fa4c4092c69564ffa81e2a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:30:59 -0700 Subject: [PATCH 41/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 122 +++++++++++------------ 1 file changed, 56 insertions(+), 66 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index cc2eeff..1c8ff47 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -39,7 +39,7 @@ env: PYTHON_VERSION: "3.10" jobs: - deploy-dev-release: + perform-version-update: runs-on: ubuntu-22.04 permissions: contents: write # To push a branch @@ -49,7 +49,10 @@ jobs: - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - run: echo "The specified version is ${{ inputs.release-version }}." - + - run: | + set -x + set -u + set -e #---------------------------------------------- # check-out repo and set-up python #---------------------------------------------- @@ -74,11 +77,7 @@ jobs: id: should_update_version env: PYTHON_FILES_CHANGED: ${{ steps.changed-files.outputs.all_changed_files }} - run: | - set -x - set -u - set -e - + run: | should_update=false for file in ${PYTHON_FILES_CHANGED}; do should_update=true @@ -149,26 +148,24 @@ jobs: # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' # run: poetry install --no-interaction --no-root - - name: Update version if necessary + - name: Update version if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | - echo "State is ${{ steps.should_update_version.outputs.value }}" - echo "Running update pyproject." - exit 1 - - name: Not running update - if: ${{ steps.should_update_version.outputs.value != 'true' }} - run: | - echo "State is ${{ steps.should_update_version.outputs.value }}" - echo "Not running update pyproject" - exit 1 + ./scripts/run_on_each.sh poetry prerelease + push-to-repository: + runs-on: ubuntu-22.04 + needs: perform-version-update + permissions: + contents: write # To push a branch + pull-requests: write # To create a PR from that branch + steps: #---------------------------------------------- # install your root project, if required #---------------------------------------------- - name: Install library run: | - ./scripts/run_on_each.sh poetry version prerelease ./scripts/poetry_install.sh # git checkout develop @@ -193,53 +190,49 @@ jobs: #---------------------------------------------- # bump version number for patch #---------------------------------------------- - - name: Bump Version - run: | - # current_tag is the last tagged release in the repository. From there - # we need to remove the v from the beginning of the tag. - # echo "Bump rule is ${{ inputs.bump-rule }}" - # echo "Given release version is ${{ inputs.release-version }}" - # dt=$(date +%Y.%-m.0) - # if ! $(git tag -l "v*" = ''); then - # # uses -V which is version sort to keep it monotonically increasing. - # current_tag=$(git tag -l "v*" | grep --invert-match '-' | sort --reverse -V | sed -n 1p) - # echo "current git tag is ${current_tag}" - # current_tag=${current_tag#?} - # if [[ "$current_tag" < "$dt" ]]; then - # current_tag=$dt - # fi - # # current_tag is now the version we want to set our poetry version so - # # that we can bump the version - # ./scripts/run_on_each.sh poetry version ${current_tag} - # ./scripts/run_on_each.sh poetry version prerelease - - # # poetry version ${current_tag} - # # poetry version prerelease --no-interaction - - # else - # # very first release. start with inputs.release-version - - # echo "First release. Setting tag as 0.1.0rc0" - # current_tag=$(date +%Y.%-m.1) - # ./scripts/run_on_each.sh poetry version ${current_tag} - - # # poetry version ${current_tag} - # fi - version=$(poetry version --short) - ./scripts/run_on_each.sh poetry version ${version} - - NEW_TAG=v$(poetry version --short) - - # Finally because we want to be able to use the variable in later - # steps we set a NEW_TAG environmental variable - echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV +# - name: Bump Version +# run: | +# # current_tag is the last tagged release in the repository. From there +# # we need to remove the v from the beginning of the tag. +# # echo "Bump rule is ${{ inputs.bump-rule }}" +# # echo "Given release version is ${{ inputs.release-version }}" +# # dt=$(date +%Y.%-m.0) +# # if ! $(git tag -l "v*" = ''); then +# # # uses -V which is version sort to keep it monotonically increasing. +# # current_tag=$(git tag -l "v*" | grep --invert-match '-' | sort --reverse -V | sed -n 1p) +# # echo "current git tag is ${current_tag}" +# # current_tag=${current_tag#?} +# # if [[ "$current_tag" < "$dt" ]]; then +# # current_tag=$dt +# # fi +# # # current_tag is now the version we want to set our poetry version so +# # # that we can bump the version +# # ./scripts/run_on_each.sh poetry version ${current_tag} +# # ./scripts/run_on_each.sh poetry version prerelease +# +# # # poetry version ${current_tag} +# # # poetry version prerelease --no-interaction +# +# # else +# # # very first release. start with inputs.release-version +# +# # echo "First release. Setting tag as 0.1.0rc0" +# # current_tag=$(date +%Y.%-m.1) +# # ./scripts/run_on_each.sh poetry version ${current_tag} +# +# # # poetry version ${current_tag} +# # fi +# version=$(poetry version --short) +# ./scripts/run_on_each.sh poetry version ${version} +# +# NEW_TAG=v$(poetry version --short) +# +# # Finally because we want to be able to use the variable in later +# # steps we set a NEW_TAG environmental variable +# echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV - name: Create build artifacts run: | - set -x - set -u - set -e - # set the right version in pyproject.toml before build and publish ./scripts/poetry_build.sh @@ -259,10 +252,7 @@ jobs: id: publish-to-pypi if: github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools' run: | - set -x - set -u - set -e - + # This is needed, because the poetry publish will fail at the top level of the project # so ./scripts/run_on_each.sh fails for that. echo "POETRY_PUBLISH_OPTIONS=''" >> $GITHUB_ENV From 20dbe1621a9ec9f11f36bd0bbe4f38d34dd2e0d3 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:31:28 -0700 Subject: [PATCH 42/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 1c3b710..294d974 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -47,10 +47,12 @@ import typing StrPath = typing.Union[str, pathlib.Path] - from gridappsd.goss import GOSS from gridappsd.utils import ProcessStatusEnum from gridappsd.gridappsd import GridAPPSD from gridappsd.difference_builder import DifferenceBuilder from gridappsd.app_registration import ApplicationController import gridappsd.json_extension as json + + + From f2123978c0b7a52f94336488a086ca94d7a0763d Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:33:30 -0700 Subject: [PATCH 43/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 1c8ff47..64b2066 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -151,7 +151,7 @@ jobs: - name: Update version if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | - ./scripts/run_on_each.sh poetry prerelease + ./scripts/run_on_each.sh poetry version prerelease push-to-repository: runs-on: ubuntu-22.04 From 02c3dfa2c8d4786688c2587d82a508e9a54bc570 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:33:44 -0700 Subject: [PATCH 44/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index 294d974..fb41626 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -56,3 +56,6 @@ + + + From c74b7c2a30658ddcc898665fb59596d0546cd978 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:49:53 -0700 Subject: [PATCH 45/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 27 ++++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 64b2066..39ff3d1 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -22,12 +22,6 @@ on: required: false default: false type: boolean -# -# release-version: -# description: "Version number to use. If provided bump-rule will be ignored" -# required: false -# default: "" -# type: string defaults: run: @@ -39,7 +33,7 @@ env: PYTHON_VERSION: "3.10" jobs: - perform-version-update: + deploy-dev-release: runs-on: ubuntu-22.04 permissions: contents: write # To push a branch @@ -148,18 +142,17 @@ jobs: # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' # run: poetry install --no-interaction --no-root - - name: Update version + - name: Update version and commit pyproject.toml file if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | ./scripts/run_on_each.sh poetry version prerelease + + git config --global user.name 'Commit Bot' + git config --global user.email '3979063+craig8@users.noreply.github.com' + git add **/pyproject.toml + git commit -m "Auto Update Version Number" + git push - push-to-repository: - runs-on: ubuntu-22.04 - needs: perform-version-update - permissions: - contents: write # To push a branch - pull-requests: write # To create a PR from that branch - steps: #---------------------------------------------- # install your root project, if required #---------------------------------------------- @@ -232,11 +225,13 @@ jobs: # echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV - name: Create build artifacts + if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | # set the right version in pyproject.toml before build and publish ./scripts/poetry_build.sh - name: Push artifacts to github + if: ${{ steps.should_update_version.outputs.value == 'true' }} uses: ncipollo/release-action@v1 with: artifacts: "dist/*.gz,dist/*.whl" @@ -250,7 +245,7 @@ jobs: - name: Publish to pypi id: publish-to-pypi - if: github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools' + if: (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') && ${{ steps.should_update_version.outputs.value == 'true' }} run: | # This is needed, because the poetry publish will fail at the top level of the project From f32b6b6975d664a4345c27e90e58a5e5ae7dfb6a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:50:22 -0700 Subject: [PATCH 46/54] Test python job --- gridappsd-python-lib/gridappsd/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gridappsd-python-lib/gridappsd/__init__.py b/gridappsd-python-lib/gridappsd/__init__.py index fb41626..728e969 100644 --- a/gridappsd-python-lib/gridappsd/__init__.py +++ b/gridappsd-python-lib/gridappsd/__init__.py @@ -45,6 +45,7 @@ """ import pathlib import typing + StrPath = typing.Union[str, pathlib.Path] from gridappsd.goss import GOSS From 991d50abe7855420c5b235ffe3e358d273a97728 Mon Sep 17 00:00:00 2001 From: Commit Bot <3979063+craig8@users.noreply.github.com> Date: Fri, 30 Aug 2024 01:52:11 +0000 Subject: [PATCH 47/54] Auto Update Version Number --- gridappsd-field-bus-lib/pyproject.toml | 2 +- gridappsd-python-lib/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gridappsd-field-bus-lib/pyproject.toml b/gridappsd-field-bus-lib/pyproject.toml index 1584d85..b1cbc26 100644 --- a/gridappsd-field-bus-lib/pyproject.toml +++ b/gridappsd-field-bus-lib/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gridappsd-field-bus" -version = "2023.12.2a0" +version = "2023.12.2a1" description = "GridAPPS-D Field Bus Implementation" authors = [ "C. Allwardt <3979063+craig8@users.noreply.github.com>", diff --git a/gridappsd-python-lib/pyproject.toml b/gridappsd-python-lib/pyproject.toml index 33111b0..00bf7ab 100644 --- a/gridappsd-python-lib/pyproject.toml +++ b/gridappsd-python-lib/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gridappsd-python" -version = "2023.12.2a0" +version = "2023.12.2a1" description = "A GridAPPS-D Python Adapter" authors = [ "C. Allwardt <3979063+craig8@users.noreply.github.com>", From ace7f8280896f0c531ec2144983f921bdee4db08 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:01:54 -0700 Subject: [PATCH 48/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 39ff3d1..3a026af 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -225,12 +225,17 @@ jobs: # echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV - name: Create build artifacts + id: version if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | # set the right version in pyproject.toml before build and publish ./scripts/poetry_build.sh + + echo "value=v$(poetry version --short)" >> "$GITHUB_OUTPUT" - name: Push artifacts to github + env: + TAG: ${{ steps.version.outputs.value }} if: ${{ steps.should_update_version.outputs.value == 'true' }} uses: ncipollo/release-action@v1 with: @@ -240,7 +245,7 @@ jobs: commit: ${{ github.ref }} # check bump-rule and set accordingly prerelease: true - tag: ${{ env.NEW_TAG }} + tag: ${{ env.TAG }} token: ${{ secrets.GITHUB_TOKEN }} - name: Publish to pypi From 2b144ed6ffef1feb6ca166732230f362c80ceb65 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:07:15 -0700 Subject: [PATCH 49/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 3a026af..636b344 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -157,6 +157,7 @@ jobs: # install your root project, if required #---------------------------------------------- - name: Install library + if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | ./scripts/poetry_install.sh @@ -208,7 +209,7 @@ jobs: # # # else # # # very first release. start with inputs.release-version -# +#7 # # echo "First release. Setting tag as 0.1.0rc0" # # current_tag=$(date +%Y.%-m.1) # # ./scripts/run_on_each.sh poetry version ${current_tag} @@ -250,7 +251,9 @@ jobs: - name: Publish to pypi id: publish-to-pypi - if: (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') && ${{ steps.should_update_version.outputs.value == 'true' }} + if: | + ${{ steps.should_update_version.outputs.value == 'true' }} && + (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') run: | # This is needed, because the poetry publish will fail at the top level of the project From 3bf3871a496a98d7e6fbaceec639e278ed5006a2 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:10:56 -0700 Subject: [PATCH 50/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 636b344..fc60317 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -252,8 +252,9 @@ jobs: - name: Publish to pypi id: publish-to-pypi if: | - ${{ steps.should_update_version.outputs.value == 'true' }} && - (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') + ${{ steps.should_update_version.outputs.value == 'true' && + (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') + }} run: | # This is needed, because the poetry publish will fail at the top level of the project From aedcda6c8085db28d8fd59eca67ef685940cdd49 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:14:09 -0700 Subject: [PATCH 51/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index fc60317..236bd93 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -119,6 +119,7 @@ jobs: # ----- install & configure poetry ----- #---------------------------------------------- - name: Install Poetry + if: ${{ steps.should_update_version.outputs.value == 'true' }} uses: snok/install-poetry@v1 with: virtualenvs-create: true @@ -251,10 +252,7 @@ jobs: - name: Publish to pypi id: publish-to-pypi - if: | - ${{ steps.should_update_version.outputs.value == 'true' && - (github.repository_owner == 'GRIDAPPSD' || github.repository_owner == 'PNNL-CIM-Tools') - }} + if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | # This is needed, because the poetry publish will fail at the top level of the project From 54f171c965080d3ebfbf1c0e816326be4629c21f Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:16:38 -0700 Subject: [PATCH 52/54] Test update to dev-deployment --- .github/workflows/deploy-dev-release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index 236bd93..cb78db6 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -78,6 +78,11 @@ jobs: break done + # handle input required update. + if ${{ inputs.upgrade-version }} ; then + should_update=true + fi + echo "Should update == ${should_update}" echo "value=${should_update}" >> "$GITHUB_OUTPUT" @@ -110,6 +115,7 @@ jobs: # fi - name: Set up Python ${{ env.PYTHON_VERSION }} + if: ${{ steps.should_update_version.outputs.value == 'true' }} id: setup-python uses: actions/setup-python@v5 with: From 049b0958137c54493e1a4ce77e0b64e663b7aed3 Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:20:37 -0700 Subject: [PATCH 53/54] Update to use pyproject.toml file version. --- .github/workflows/deploy-dev-release.yml | 116 +---------------------- 1 file changed, 3 insertions(+), 113 deletions(-) diff --git a/.github/workflows/deploy-dev-release.yml b/.github/workflows/deploy-dev-release.yml index cb78db6..66ae989 100644 --- a/.github/workflows/deploy-dev-release.yml +++ b/.github/workflows/deploy-dev-release.yml @@ -85,34 +85,6 @@ jobs: echo "Should update == ${should_update}" echo "value=${should_update}" >> "$GITHUB_OUTPUT" - - -# - name: List all changed files -# env: -# PYTHON_FILES_CHANGED: ${{ steps.changed-files.outputs.all_changed_files }} -# run: | -# for file in ${PYTHON_FILES_CHANGED}; do -# echo "$file was changed" -# done -# -# - name: Set SHOULD_UPDATE_VERSION environmental variable -# id: should_update_version -# run: | -# set -x -# set -u -# set -e -# -# echo "$(git diff-index --name-only HEAD | grep '.py')" -# [ $(git diff-index --name-only HEAD | grep '.py') ] && has_python_code=true || has_python_code=false -# -# echo "value=$has_python_code" >> "$GITHUB_OUTPUT" -# echo "value is set to ${has_python_code}" - -# if [ $has_python_code == true || ${{ inputs.upgrade-version == true }} ] ; then -# echo "value=true" >> "$GITHUB_OUTPUT" -# else -# echo "value=false" >> "$GITHUB_OUTPUT" -# fi - name: Set up Python ${{ env.PYTHON_VERSION }} if: ${{ steps.should_update_version.outputs.value == 'true' }} @@ -132,23 +104,6 @@ jobs: virtualenvs-in-project: true installer-parallel: true - # #---------------------------------------------- - # # load cached venv if cache exists - # #---------------------------------------------- - # - name: Load cached venv - # id: cached-poetry-dependencies - # uses: actions/cache@v3 - # with: - # path: .venv - # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - - # #---------------------------------------------- - # # install dependencies if cache does not exist - # #---------------------------------------------- - # - name: Install dependencies - # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - # run: poetry install --no-interaction --no-root - - name: Update version and commit pyproject.toml file if: ${{ steps.should_update_version.outputs.value == 'true' }} run: | @@ -160,78 +115,11 @@ jobs: git commit -m "Auto Update Version Number" git push - #---------------------------------------------- - # install your root project, if required - #---------------------------------------------- - name: Install library if: ${{ steps.should_update_version.outputs.value == 'true' }} - run: | - + run: | ./scripts/poetry_install.sh - # git checkout develop - # poetry lock --no-update - # poetry install --no-interaction - - # - name: Use given release-version number - # if: inputs.release-version != '' - # run: | - # echo "Using given release version is ${{ inputs.release-version }}" - # poetry version ${{ inputs.release-version }} - - # NEW_TAG=v$(poetry version --short) - - # # we want to be able to use the variable in later - # # steps we set a NEW_TAG environmental variable - # echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV - # # we don't want to update pyproject.toml yet. don't want this change to create merge conflict. - # # we don't really persist right version in pyproject.toml to figure out the next version. we use git tags. - # git restore pyproject.toml - - #---------------------------------------------- - # bump version number for patch - #---------------------------------------------- -# - name: Bump Version -# run: | -# # current_tag is the last tagged release in the repository. From there -# # we need to remove the v from the beginning of the tag. -# # echo "Bump rule is ${{ inputs.bump-rule }}" -# # echo "Given release version is ${{ inputs.release-version }}" -# # dt=$(date +%Y.%-m.0) -# # if ! $(git tag -l "v*" = ''); then -# # # uses -V which is version sort to keep it monotonically increasing. -# # current_tag=$(git tag -l "v*" | grep --invert-match '-' | sort --reverse -V | sed -n 1p) -# # echo "current git tag is ${current_tag}" -# # current_tag=${current_tag#?} -# # if [[ "$current_tag" < "$dt" ]]; then -# # current_tag=$dt -# # fi -# # # current_tag is now the version we want to set our poetry version so -# # # that we can bump the version -# # ./scripts/run_on_each.sh poetry version ${current_tag} -# # ./scripts/run_on_each.sh poetry version prerelease -# -# # # poetry version ${current_tag} -# # # poetry version prerelease --no-interaction -# -# # else -# # # very first release. start with inputs.release-version -#7 -# # echo "First release. Setting tag as 0.1.0rc0" -# # current_tag=$(date +%Y.%-m.1) -# # ./scripts/run_on_each.sh poetry version ${current_tag} -# -# # # poetry version ${current_tag} -# # fi -# version=$(poetry version --short) -# ./scripts/run_on_each.sh poetry version ${version} -# -# NEW_TAG=v$(poetry version --short) -# -# # Finally because we want to be able to use the variable in later -# # steps we set a NEW_TAG environmental variable -# echo "NEW_TAG=$(echo ${NEW_TAG})" >> $GITHUB_ENV - - name: Create build artifacts id: version if: ${{ steps.should_update_version.outputs.value == 'true' }} @@ -241,6 +129,8 @@ jobs: echo "value=v$(poetry version --short)" >> "$GITHUB_OUTPUT" + # TODO: Check for pipy token and only release to github if we have it. + - name: Push artifacts to github env: TAG: ${{ steps.version.outputs.value }} From 6f60e30a45a46c081688deccf186bb6b0d37c31a Mon Sep 17 00:00:00 2001 From: "C. Allwardt" <3979063+craig8@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:20:37 -0700 Subject: [PATCH 54/54] Bump version to 2024.8.1 --- gridappsd-field-bus-lib/pyproject.toml | 2 +- gridappsd-python-lib/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gridappsd-field-bus-lib/pyproject.toml b/gridappsd-field-bus-lib/pyproject.toml index b1cbc26..e370355 100644 --- a/gridappsd-field-bus-lib/pyproject.toml +++ b/gridappsd-field-bus-lib/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gridappsd-field-bus" -version = "2023.12.2a1" +version = "2024.8.1a0" description = "GridAPPS-D Field Bus Implementation" authors = [ "C. Allwardt <3979063+craig8@users.noreply.github.com>", diff --git a/gridappsd-python-lib/pyproject.toml b/gridappsd-python-lib/pyproject.toml index 00bf7ab..a6f4d38 100644 --- a/gridappsd-python-lib/pyproject.toml +++ b/gridappsd-python-lib/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gridappsd-python" -version = "2023.12.2a1" +version = "2024.8.1a0" description = "A GridAPPS-D Python Adapter" authors = [ "C. Allwardt <3979063+craig8@users.noreply.github.com>",