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 2021/03/12 06:29:57 UTC
[isis-app-simpleapp] branch jdo updated (336d2af -> 06e771f)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
omit 336d2af minor improvements to actions
new 06e771f minor improvements to actions
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (336d2af)
\
N -- N -- N refs/heads/jdo (06e771f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/mavenJdk15.yml | 27 ++++++++++++++++++++-------
.github/workflows/mavenJdk8.yml | 3 ---
2 files changed, 20 insertions(+), 10 deletions(-)
[isis-app-simpleapp] 01/01: minor improvements to actions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 06e771fca94a652111b6a03e606d5fb5c03e8502
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 12 06:28:25 2021 +0000
minor improvements to actions
---
.github/workflows/mavenJdk15.yml | 27 ++++++++++++++++++++-------
.github/workflows/mavenJdk8.yml | 29 +++++++++++++++++++++--------
2 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/mavenJdk15.yml b/.github/workflows/mavenJdk15.yml
index 68b4738..0d6dfe8 100644
--- a/.github/workflows/mavenJdk15.yml
+++ b/.github/workflows/mavenJdk15.yml
@@ -1,6 +1,3 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
name: Build w/ Maven + Jdk 15
on:
@@ -46,7 +43,8 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- - name: Prepare Build Versions
+ - name: Calculate $REVISION
+ id: revision
shell: bash
run: |
ON_SNAPSHOT=$(echo $GITHUB_REF | grep SNAPSHOT)
@@ -59,6 +57,21 @@ jobs:
BASELINE=$(cat pom.xml | grep "<version>" | head -1 | awk -F'>' '{print $2}' | awk -F'<' '{print $1}')
SHA_ID=$(echo $GITHUB_SHA | cut -c1-8)
REVISION=${BASELINE}.$(date +%Y%m%d-%H%M)-${SHA_ID}
+ echo "##[set-output name=revision;]${REVISION}"
+
+ - name: Share $REVISION as Environment Variable
+ run: echo "REVISION=${{ steps.revision.outputs.revision }}" >> $GITHUB_ENV
+
+ - name: Print $REVISION
+ shell: bash
+ run: |
+ echo ============== ENV =================
+ echo REVISION \: $REVISION
+ echo ======================================
+
+ - name: Update Maven version
+ shell: bash
+ run: |
mvn versions:set -DnewVersion=$REVISION
- name: Print pom.xml
@@ -75,7 +88,7 @@ jobs:
# - name: Build and Push Docker Image
# shell: bash
# run: |
-# export REVISION=...
-# export DOCKER_REGISTRY_USERNAME
-# export DOCKER_REGISTRY_PASSWORD
# mvn -pl webapp -Ddocker jib:build
+# env:
+# DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+# DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
diff --git a/.github/workflows/mavenJdk8.yml b/.github/workflows/mavenJdk8.yml
index 6600221..8aa384d 100644
--- a/.github/workflows/mavenJdk8.yml
+++ b/.github/workflows/mavenJdk8.yml
@@ -1,6 +1,3 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
name: Build w/ Maven + Jdk 8
on:
@@ -19,7 +16,7 @@ on:
jobs:
build:
-
+ name: Build, Test
runs-on: ubuntu-latest
steps:
@@ -46,7 +43,8 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- - name: Prepare Build Versions
+ - name: Calculate $REVISION
+ id: revision
shell: bash
run: |
ON_SNAPSHOT=$(echo $GITHUB_REF | grep SNAPSHOT)
@@ -59,6 +57,21 @@ jobs:
BASELINE=$(cat pom.xml | grep "<version>" | head -1 | awk -F'>' '{print $2}' | awk -F'<' '{print $1}')
SHA_ID=$(echo $GITHUB_SHA | cut -c1-8)
REVISION=${BASELINE}.$(date +%Y%m%d-%H%M)-${SHA_ID}
+ echo "##[set-output name=revision;]${REVISION}"
+
+ - name: Share $REVISION as Environment Variable
+ run: echo "REVISION=${{ steps.revision.outputs.revision }}" >> $GITHUB_ENV
+
+ - name: Print $REVISION
+ shell: bash
+ run: |
+ echo ============== ENV =================
+ echo REVISION \: $REVISION
+ echo ======================================
+
+ - name: Update Maven version
+ shell: bash
+ run: |
mvn versions:set -DnewVersion=$REVISION
- name: Print pom.xml
@@ -75,7 +88,7 @@ jobs:
# - name: Build and Push Docker Image
# shell: bash
# run: |
-# export REVISION=...
-# export DOCKER_REGISTRY_USERNAME
-# export DOCKER_REGISTRY_PASSWORD
# mvn -pl webapp -Ddocker jib:build
+# env:
+# DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+# DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}