Merge branch 'develop-2.x' into 2.x

Author: DorianNiemiecSVRJS

.github/workflows/release-v2.yml

@@ -230,13 +230,13 @@ jobs:
           # The "move-ferron2-archive" is a custom command that moves the ZIP archive to be served by the download server
           ssh ferron-servers "sudo move-ferron2-archive ${{ env.FERRON_VERSION }} ${{ matrix.target }}"
 
-      # - name: Release Ferron to GitHub
-      #   uses: ncipollo/release-action@v1
-      #   with:
-      #     allowUpdates: true
-      #     artifacts: "ferron-${{ env.FERRON_VERSION }}-${{ matrix.target }}.zip"
-      #     tag: "${{ env.FERRON_VERSION }}"
-      #     commit: "main"
+      - name: Release Ferron to GitHub
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: "ferron-${{ env.FERRON_VERSION }}-${{ matrix.target }}.zip"
+          tag: "${{ env.FERRON_VERSION }}"
+          commit: "2.x"
 
       - name: Build and release Debian package
         if: matrix.runner == 'warp-ubuntu-latest-x64-8x' && contains(matrix.target, 'linux-gnu')
@@ -253,6 +253,21 @@ jobs:
           # The "update-ferron-deb-repo" is a custom command that updates the Debian repository
           ssh ferron-servers "sudo update-ferron-deb-repo $DEB_PACKAGE_VERSION $DEB_ARCHITECTURE"
 
+      - name: Build and release RPM package
+        if: matrix.runner == 'warp-ubuntu-latest-x64-8x' && contains(matrix.target, 'linux-gnu')
+        shell: bash
+        run: |
+          packaging/rpm/build.sh ${{ matrix.target }} ${{ env.FERRON_VERSION }} target/${{ matrix.target }}/release
+
+          RPM_FILE_NAME_WO_RPM=$(ls dist/*.rpm | head -n 1 | sed -E 's|^dist/||' | sed -E 's/\.rpm$//')
+          RPM_PACKAGE_VERSION=$(echo $RPM_FILE_NAME_WO_RPM | cut -d'-' -f2)
+          RPM_ARCHITECTURE=$(echo $RPM_FILE_NAME_WO_RPM | rev | cut -d'.' -f1 | rev)
+          ssh ferron-servers "mkdir -p rpm || true"
+          scp dist/${RPM_FILE_NAME_WO_RPM}.rpm ferron-servers:rpm/${RPM_FILE_NAME_WO_RPM}.rpm
+
+          # The "update-ferron-rpm-repo" is a custom command that updates the RPM repository
+          ssh ferron-servers "sudo update-ferron-rpm-repo $RPM_PACKAGE_VERSION $RPM_ARCHITECTURE"
+
   docs:
     runs-on: warp-ubuntu-latest-x64-8x
 
@@ -360,11 +375,11 @@ jobs:
           TAG_TYPE=${{ matrix.group }}
           FERRON_MAJOR_VERSION=$(echo "$FERRON_VERSION" | cut -d '.' -f 1)
           if [ "$TAG_TYPE" = "latest" ] || [ "$TAG_TYPE" = "" ]; then
-            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION,ferronserver/ferron:$FERRON_MAJOR_VERSION"
-            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION"
+            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION,ferronserver/ferron:$FERRON_MAJOR_VERSION,ferronserver/ferron:latest"
+            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION,ghcr.io/ferronweb/ferron:latest"
           else
-            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION-$TAG_TYPE,ferronserver/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE"
-            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE"
+            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION-$TAG_TYPE,ferronserver/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE,ferronserver/ferron:$TAG_TYPE"
+            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$TAG_TYPE"
           fi
           echo "DOCKER_TAGS=$DOCKER_HUB_TAGS,$DOCKER_GHCR_TAGS" >> $GITHUB_ENV
 

.github/workflows/release.yml

@@ -153,13 +153,13 @@ jobs:
           # The "move-ferron-archive" is a custom command that moves the ZIP archive to be served by the download server
           ssh ferron-servers "sudo move-ferron-archive ${{ env.FERRON_VERSION }} ${{ matrix.target }}"
 
-      - name: Release Ferron to GitHub
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          artifacts: "ferron-${{ env.FERRON_VERSION }}-${{ matrix.target }}.zip"
-          tag: "${{ env.FERRON_VERSION }}"
-          commit: "main"
+      # - name: Release Ferron to GitHub
+      #   uses: ncipollo/release-action@v1
+      #   with:
+      #     allowUpdates: true
+      #     artifacts: "ferron-${{ env.FERRON_VERSION }}-${{ matrix.target }}.zip"
+      #     tag: "${{ env.FERRON_VERSION }}"
+      #     commit: "main"
 
   docs:
     runs-on: ubuntu-latest
@@ -263,11 +263,11 @@ jobs:
           TAG_TYPE=${{ matrix.group }}
           FERRON_MAJOR_VERSION=$(echo "$FERRON_VERSION" | cut -d '.' -f 1)
           if [ "$TAG_TYPE" = "latest" ] || [ "$TAG_TYPE" = "" ]; then
-            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION,ferronserver/ferron:$FERRON_MAJOR_VERSION,ferronserver/ferron:latest"
-            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION,ghcr.io/ferronweb/ferron:latest"
+            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION,ferronserver/ferron:$FERRON_MAJOR_VERSION"
+            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION"
           else
-            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION-$TAG_TYPE,ferronserver/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE,ferronserver/ferron:$TAG_TYPE"
-            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$TAG_TYPE"
+            DOCKER_HUB_TAGS="ferronserver/ferron:$FERRON_VERSION-$TAG_TYPE,ferronserver/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE"
+            DOCKER_GHCR_TAGS="ghcr.io/ferronweb/ferron:$FERRON_VERSION-$TAG_TYPE,ghcr.io/ferronweb/ferron:$FERRON_MAJOR_VERSION-$TAG_TYPE"
           fi
           echo "DOCKER_TAGS=$DOCKER_HUB_TAGS,$DOCKER_GHCR_TAGS" >> $GITHUB_ENV
 

.gitignore

@@ -42,3 +42,6 @@ Thumbs.db
 # Temporary files used during packaging
 /packaging/deb/ferron_*
 /packaging/deb/md5sums.tmp
+/packaging/rpm/data/
+/packaging/rpm/rpm/
+/packaging/rpm/ferron.spec