Merge pull request #433 from gurgenyegoryan/main-dev

Add Rebase Action

.github/workflows/prerelease.yml

@@ -3,6 +3,8 @@ name: Pre-Release
 on:
   push:
     branches: ["main-dev"]
+  pull_request:
+    branches: ["main-dev"]
 
   workflow_dispatch: {}
 
@@ -27,7 +29,7 @@ jobs:
   build_ustore_amd64:
     name: Build Libraries on AMD
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
+    if: ${{ github.event_name == 'push' || github.event_name == 'pull_request'}}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -203,4 +205,4 @@ jobs:
           export USTORE_TEST_PATH="./tmp/"
           sed -i 's/make -j/make -j4/' /home/runner/work/ustore/ustore/java/pack.sh
           export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
-          bash /home/runner/work/ustore/ustore/java/pack.sh
+          bash /home/runner/work/ustore/ustore/java/pack.sh

.github/workflows/release.yml

@@ -36,6 +36,31 @@ jobs:
     - uses: actions/setup-node@v3
     - run: cp .github/workflows/package.json . && npm install && npx semantic-release
 
+
+  rebase:
+    name: Rebase Dev. Branch
+    needs: versioning
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Perform rebase
+        run: |
+          git fetch origin main
+          git checkout main-dev
+          git rebase origin/main
+          
+      - name: Push changes
+        uses: CasperWA/push-protected@v2
+        with:
+          token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}
+          branch: main-dev
+          unprotect_reviews: True
+          force: True
+
   # Single deploy job since we're just deploying
   deploy:
     name: Deploy Docs

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
 }
 
-group "cloud.unum.ustore"
+group "cloud.unum"
 version = file("VERSION").text.trim()
 
 sourceCompatibility = 1.8