You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/03/14 18:51:15 UTC
[isis] branch ISIS-2975 updated: ISIS-2975: experiments (17)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2975
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2975 by this push:
new 5275e62 ISIS-2975: experiments (17)
5275e62 is described below
commit 5275e627b727273bac49b34654fa126cee82e4af
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 14 18:50:49 2022 +0000
ISIS-2975: experiments (17)
---
.github/workflows/ci-build-artifacts-push-maven.yml | 15 +++++++--------
scripts/ci/calc-revision.sh | 8 +++++++-
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index 03ccd38..a02e236 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -42,6 +42,13 @@ jobs:
- name: Share $BASELINE as Environment Variable
run: echo "BASELINE=${{ steps.calc-baseline.outputs.baseline }}" >> $GITHUB_ENV
+ - name: Calculate new $REVISION
+ id: revision
+ run: 'bash scripts/ci/calc-revision.sh'
+
+ - name: Share $REVISION as Environment Variable
+ run: echo "REVISION=${{ steps.revision.outputs.revision }}" >> $GITHUB_ENV
+
- name: Dump Env context
env:
ENV_CONTEXT: ${{ toJson(env) }}
@@ -61,14 +68,6 @@ jobs:
# ${{ runner.os }}-${{ env.cache-name }}-
# ${{ runner.os }}-
#
-# - name: Calculate new $REVISION (if changed since last published, else skip)
-# id: revision
-# shell: bash
-# run: bash scripts/ci/calc-revision.sh
-#
-# - name: Share $REVISION as Environment Variable
-# run: echo "REVISION=${{ steps.revision.outputs.revision }}" >> $GITHUB_ENV
-#
# - name: Setup Script Environment
# shell: bash
# run: |
diff --git a/scripts/ci/calc-revision.sh b/scripts/ci/calc-revision.sh
index 12db771..55ecf2e 100644
--- a/scripts/ci/calc-revision.sh
+++ b/scripts/ci/calc-revision.sh
@@ -4,7 +4,13 @@ echo ""
echo ""
echo ""
-DATE=$(date +%Y%m%d.%H%M)
+if [ ! -z "$TIMESTAMP" ]
+then
+ # TIMESTAMP: 2022-03-14T18:43:38Z
+ DATE="$(echo $TIMESTAMP | cut -c1-4)$(echo $TIMESTAMP | cut -c6-7)$(echo $TIMESTAMP | cut -c9-10).$(echo $TIMESTAMP | cut -c12-13)$(echo $TIMESTAMP | cut -c15-16)"
+else
+ DATE=$(date +%Y%m%d.%H%M)
+fi
BRANCH=$(echo $GITHUB_REF_NAME)
GIT_SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c1-8)