Merge pull request #6 from Onlineberatung/develop

[pull] develop from Onlineberatung:develop
virtualidentityag · Oct 14, 2022 · aad301b · aad301b
2 parents c45d2c8 + ff88cba
commit aad301b
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 34 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -1,7 +1,7 @@
-version: '1'
+version: "1"
 rules:
-    - base: develop
-      upstream: Onlineberatung:develop
-      mergeMethod: merge
-label: ':arrow_heading_down: pull'
-conflictLabel: 'merge-conflict'
+  - base: develop
+    upstream: Onlineberatung:develop
+    mergeMethod: merge
+label: ":arrow_heading_down: pull"
+conflictLabel: "merge-conflict"
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -2,8 +2,11 @@ name: Publish Docker image
 
 on:
   push:
+    branches:
+      - "develop"
     tags:
-      - 'dockerImage.v.*'
+      - "dockerImage.v.*"
+      - "v*"
 
 jobs:
   test:
@@ -38,8 +41,8 @@ jobs:
   push_to_registry:
     strategy:
       matrix:
-        registry: [ "docker.pkg.github.com", "ghcr.io" ]
-    needs: [ test ]
+        registry: ["docker.pkg.github.com", "ghcr.io"]
+    needs: [test]
     name: Push Docker image to GitHub Packages
     runs-on: ubuntu-latest
     steps:
@@ -48,10 +51,27 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: targetfiles
-      - name: Prepare Docker variables
+      - name: Get current time
+        id: time
+        uses: nanzm/[email protected]
+        with:
+          timeZone: 2
+          format: "YYYYMMDD[_]HHmmss"
+      - name: Prepare environment variables
         run: |
           echo "DOCKER_REGISTRY=$(echo "${{ matrix.registry }}/${{ github.repository }}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
           echo "DOCKER_IMAGE=$(echo "${{ github.repository }}" | awk -F / '{print tolower($2)}')" >> $GITHUB_ENV
+          echo CLEAN_REF=$(echo "${GITHUB_REF_NAME#refs/heads/}") >> $GITHUB_ENV
+          echo TYPE=$(echo -n "${GITHUB_REF_TYPE}") >> $GITHUB_ENV
+          echo TIME_STAMP=$(echo -n "${{ steps.time.outputs.time }}") >> $GITHUB_ENV
+        shell: bash
+      - name: Set branch_timestamp for image from branch
+        if: ${{ env.TYPE == 'branch' }}
+        run: echo DOCKER_IMAGE_TAG=$(echo "${{ env.CLEAN_REF }}_${{ env.TIME_STAMP }}") >> $GITHUB_ENV
+        shell: bash
+      - name: Set tag for image from tag
+        if: ${{ env.TYPE == 'tag' }}
+        run: echo DOCKER_IMAGE_TAG=$(echo "${{ env.CLEAN_REF }}") >> $GITHUB_ENV
         shell: bash
       - name: Push to GitHub Packages
         uses: docker/[email protected]
@@ -60,4 +80,17 @@ jobs:
           password: ${{ secrets.GH_PACKAGE_RELEASE_TOKEN }}
           registry: ${{ env.DOCKER_REGISTRY }}
           repository: ${{ env.DOCKER_IMAGE }}
-          tag_with_ref: true
+          tags: ${{ env.DOCKER_IMAGE_TAG}}
+      - name: Hint about the Docker Image Tag if successfull
+        if: ${{ success() }}
+        run: |
+          echo "### Publish Docker image :white_check_mark:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- Image name: ${{ env.DOCKER_IMAGE }}" >> $GITHUB_STEP_SUMMARY
+          echo "- Version: ${{ env.DOCKER_IMAGE_TAG }}" >> $GITHUB_STEP_SUMMARY
+      - name: Hint about the Docker Image Tag if not successfull
+        if: ${{ failure() || cancelled() }}
+        run: |
+          echo "### Publish Docker image :x:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- It seems that something has gone wrong" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -3,35 +3,34 @@ name: Feature Branch
 on:
   push:
     branches-ignore:
-      - 'master'
-      - 'staging'
-      - 'develop'
+      - "master"
+      - "staging"
+      - "develop"
 
 jobs:
   test:
     name: Build and run unit tests
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-    - name: Checkout
-      uses: actions/checkout@v2
+      - name: Setup JVM
+        uses: actions/setup-java@v2
+        with:
+          java-version: "11"
+          distribution: "adopt"
+          architecture: x64
 
-    - name: Setup JVM
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-        architecture: x64
+      - name: Caching maven dependencies
+        uses: actions/cache@v1
+        env:
+          cache-name: cache-maven-dependencies
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
 
-    - name: Caching maven dependencies
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-maven-dependencies
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-
-    - name: Maven Package
-      run: mvn -B -Pprod  clean package -DskipTests
-    - name: Maven Verify
-      run: mvn -B -Pprod clean verify
+      - name: Maven Package
+        run: mvn -B -Pprod  clean package -DskipTests
+      - name: Maven Verify
+        run: mvn -B -Pprod clean verify