Merge d14ece1 into b58f2be

manticoresoftware · May 14, 2024 · 77c0f3b · 77c0f3b
2 parents b58f2be + d14ece1
commit 77c0f3b
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 101 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,12 +6,12 @@ on:
       - 'v*.*.*'
     branches:
       - main
+      - feature/update-deps-with-commits
 
 env:
   APP_NAME: 'manticore-backup'
   MAINTAINER: 'Manticore'
   DESC: 'Manticore Backup'
-
 jobs:
   vars:
     runs-on: ubuntu-22.04
@@ -23,7 +23,7 @@ jobs:
       deb_suffix: ${{ steps.vars.outputs.deb_suffix }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: vars
         run: |
           version=$(<APP_VERSION)
@@ -41,7 +41,7 @@ jobs:
     needs:
       - vars
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build binary
         run: |
           git clone https://github.com/manticoresoftware/phar_builder.git
@@ -115,7 +115,7 @@ jobs:
     needs:
       - vars
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build binary
         run: |
           git clone https://github.com/manticoresoftware/phar_builder.git
@@ -214,7 +214,7 @@ jobs:
       - build-linux-packages
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Generate changelog
@@ -224,113 +224,93 @@ jobs:
       - name: Create Release
         id: create-release
         uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        #env:
+          #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           body_path: ./changelog
           draft: true
           prerelease: false
 
-  deploy:
-    needs:
-      - build-artifact
-      - sign-windows-artifact
-      - build-linux-packages
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        include:
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: buster
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: bionic
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: focal
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: jammy
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: bullseye
-          - artifact: artifact-deb
-            type: deb
-            arch: all
-            delimiter: "-"
-            distro: bookworm
-          - artifact: artifact-el7-rpm
-            type: rpm
-            arch: noarch
-            delimiter: "_"
-            distro: 7
-          - artifact: artifact-el8-rpm
-            type: rpm
-            arch: noarch
-            delimiter: "_"
-            distro: 8
-          - artifact: artifact-el9-rpm
-            type: rpm
-            arch: noarch
-            delimiter: "_"
-            distro: 9
-          - artifact: artifact
-            type: arc
-            arch: noarch
-            delimiter: "-"
-            distro: ""
-    steps:
-      - name: Deploy package
-        uses: manticoresoftware/publish_to_repo@main
-        with:
-          ssh_key: ${{ secrets.REPO_SSH_KEY }}
-          distr: ${{ matrix.distro }}
-          arch: ${{ matrix.arch }}
-          artifact: ${{ matrix.artifact }}
-          type: ${{ matrix.type }}
-          delimiter: ${{ matrix.delimiter }}
+  #deploy:
+    #needs:
+      #- build-artifact
+      #- sign-windows-artifact
+      #- build-linux-packages
+    #runs-on: ubuntu-22.04
+    #strategy:
+      #matrix:
+        #include:
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: buster
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: bionic
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: focal
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: jammy
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: bullseye
+          #- artifact: artifact-deb
+            #type: deb
+            #arch: all
+            #delimiter: "-"
+            #distro: bookworm
+          #- artifact: artifact-el7-rpm
+            #type: rpm
+            #arch: noarch
+            #delimiter: "_"
+            #distro: 7
+          #- artifact: artifact-el8-rpm
+            #type: rpm
+            #arch: noarch
+            #delimiter: "_"
+            #distro: 8
+          #- artifact: artifact-el9-rpm
+            #type: rpm
+            #arch: noarch
+            #delimiter: "_"
+            #distro: 9
+          #- artifact: artifact
+            #type: arc
+            #arch: noarch
+            #delimiter: "-"
+            #distro: ""
+    #steps:
+      #- name: Deploy package
+        #uses: manticoresoftware/publish_to_repo@main
+        #with:
+          #ssh_key: ${{ secrets.REPO_SSH_KEY }}
+          #distr: ${{ matrix.distro }}
+          #arch: ${{ matrix.arch }}
+          #artifact: ${{ matrix.artifact }}
+          #type: ${{ matrix.type }}
+          #delimiter: ${{ matrix.delimiter }}
 
   update-manticoresearch-deps:
     needs:
       - vars
-      - deploy
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: "manticoresoftware/manticoresearch"
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update deps.txt
-        id: deps
-        run: |
-          version=${{ needs.vars.outputs.app_version }}
-          date=${{ needs.vars.outputs.app_date }}
-          commit=${{ needs.vars.outputs.app_commit }}
-
-          version_string="$version $date $commit"
-          echo "version_string=${version_string// /-}" >> $GITHUB_OUTPUT
-          sed -i '/^backup\s/c\backup '"$version_string" deps.txt
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+      - name: Update deps
+        uses: manticoresoftware/manticoresearch/actions/update-deps@feature/pr-action
         with:
+          name: backup
+          version: "${{ needs.vars.outputs.app_version }} ${{ needs.vars.outputs.app_date }} ${{ needs.vars.outputs.app_commit }}"
           token: ${{ secrets.PR_TOKEN }}
-          commit-message: "Bump backup version to: ${{ steps.deps.outputs.version_string }}"
-          title: "Update backup version"
-          body: "Updating backup version to ${{ steps.deps.outputs.version_string }}"
-          branch: "update-backup-version"
-          draft: false
diff --git a/APP_VERSION b/APP_VERSION
@@ -1 +1 @@
-1.3.5
+1.3.7