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 07:01:11 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated: re-enables
remainder of workflow, removes jdk15 variant
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new 9862007 re-enables remainder of workflow, removes jdk15 variant
9862007 is described below
commit 9862007e30659704de6f4fde3a16a3e6f4033c7e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 12 07:01:00 2021 +0000
re-enables remainder of workflow, removes jdk15 variant
---
.github/workflows/build-and-test.yml | 64 ++++++++++++------------
.github/workflows/mavenJdk15.yml | 94 ------------------------------------
2 files changed, 32 insertions(+), 126 deletions(-)
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0ca3201..e3244c4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,4 +1,4 @@
-name: Build and Test
+name: Maven Build and Test
on:
push:
@@ -69,36 +69,36 @@ jobs:
echo "REVISION : $REVISION"
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
-# shell: bash
-# run: |
-# cat pom.xml
-#
-# - name: Build with Maven
+ - 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
+ shell: bash
+ run: |
+ cat pom.xml
+
+ - name: Build with Maven
+ shell: bash
+ run: |
+ mvn install
+
+# uncomment and set environment variables to push to Docker registry
+# - name: Build and Push Docker Image
# shell: bash
# run: |
-# mvn install
-#
-## uncomment and set environment variables to push to Docker registry
-## - name: Build and Push Docker Image
-## shell: bash
-## run: |
-## mvn -pl webapp -Ddocker jib:build
-## env:
-## DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
-## DOCKER_REGISTRY_PASSWORD: ${{ secrets.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/mavenJdk15.yml b/.github/workflows/mavenJdk15.yml
deleted file mode 100644
index 0d6dfe8..0000000
--- a/.github/workflows/mavenJdk15.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: Build w/ Maven + Jdk 15
-
-on:
- push:
- branches:
- - jdo
- - jpa
- - jdo-SNAPSHOT
- - jpa-SNAPSHOT
- pull_request:
- branches:
- - jdo
- - jpa
- - jdo-SNAPSHOT
- - jpa-SNAPSHOT
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repo
- uses: actions/checkout@v2.3.3
-
- - name: Set up JDK 15
- uses: actions/setup-java@v1
- with:
- java-version: 15
-
- - name: Print Maven Version
- run: mvn --version
-
- - name: Activate Cache for Maven Downloads
- uses: actions/cache@v2
- env:
- cache-name: cache-maven-modules
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-build-${{ env.cache-name }}-
- ${{ runner.os }}-build-
- ${{ runner.os }}-
-
- - name: Calculate $REVISION
- id: revision
- shell: bash
- run: |
- ON_SNAPSHOT=$(echo $GITHUB_REF | grep SNAPSHOT)
- if [[ $ON_SNAPSHOT != "" ]]
- then
- PARENT=$(curl -X GET "https://nexus.incode.work/service/rest/v1/search?sort=version&repository=nightly-builds&group=org.apache.isis.app&name=isis-app-starter-parent" -H "accept: application/json" -s | jq '.items[0].version' | sed 's/"//g')
- echo "parentVersion = $PARENT"
- mvn versions:update-parent -DparentVersion="[$PARENT]"
- fi
- 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
- shell: bash
- run: |
- cat pom.xml
-
- - name: Build with Maven
- shell: bash
- run: |
- mvn install
-
-# uncomment and set environment variables to push to Docker registry
-# - name: Build and Push Docker Image
-# shell: bash
-# run: |
-# mvn -pl webapp -Ddocker jib:build
-# env:
-# DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
-# DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}