Merge branch 'master' into dev-version-2

.github/workflows/dev-docker-publish.yml

@@ -5,43 +5,15 @@ on:
     branches-ignore:
       - master
       - version-*
+      - dependabot**
     paths-ignore:
       - README.md
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      # Prepare custom build version
-      - name: Get branch name
-        id: branch
-        run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
-      - name: Get release_version
-        id: ver
-        uses: christian-draeger/[email protected]
-        with:
-          path: gradle.properties
-          property: release_version
-      - name: Build custom release version
-        id: release_ver
-        run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}"
-      - name: Show custom release version
-        run: echo ${{ steps.release_ver.outputs.value }}
-      # Build and publish image
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-      - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-        id: meta
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }}
-          labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }}
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    with:
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-publish.yml

@@ -7,31 +7,14 @@ on:
       - version-*
     paths:
       - gradle.properties
+#    - package_info.json  
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-      id: meta
-    - name: Read version from gradle.properties
-      id: read_property
-      uses: christian-draeger/[email protected]
-      with:
-        path: ./gradle.properties
-        property: release_version
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }}
-        labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }}
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+

README.md

@@ -131,4 +131,5 @@ It's been verified that Sailfish itself is compatible with versions from BOM and
 ## 0.3.0
 * th2-common upgrade to `3.44.0`
 * th2-bom upgrade to `4.1.0`
-* sailfish upgrade to `3.3.51`
+* th2-codec upgrade to `4.7.6`
+* sailfish upgrade to `3.3.54`