Merge pull request majlis-erc#788 from evolvedbinary/feature/ci-bump-version

Bump the version of manuForma when committing to main and before deploying

Author: mMoliere

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        jdk: [8,11,17,21]
+        jdk: [11,17,21,25]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -17,59 +17,53 @@ jobs:
         with:
           distribution: 'liberica'
           java-version: ${{ matrix.jdk }}
-      - run: mvn clean package
+      - name: Build, Test, and Package
+        run: mvn clean package
       - name: Persist built XAR
-        if: matrix.os == 'ubuntu-latest' && matrix.jdk == '8'
+        if: matrix.os == 'ubuntu-latest' && matrix.jdk == '11' && github.ref != 'refs/heads/main'
         uses: actions/upload-artifact@v4
         with:
           name: xar
           path: target/manuforma-*.xar
           if-no-files-found: error
           retention-days: 1
           overwrite: true
-      - name: Persist built ci-resources
-        if: matrix.os == 'ubuntu-latest' && matrix.jdk == '8'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ci-resources
-          path: target/classes/ci-resources/*
-          if-no-files-found: error
-          retention-days: 1
-          overwrite: true
 
-  deploy:
+  deploy-staging:
     if: github.ref == 'refs/heads/main'
     needs: build
     name: Deploy
     runs-on: ubuntu-latest
     environment: manuforma-staging
     steps:
-      - name: Retrieve built XAR
-        uses: actions/download-artifact@v4
-        with:
-          name: xar
-      - name: Retrieve built ci-resources
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
-          name: ci-resources
-      - name: Set scripts as executable
-        run: chmod +x upload-remote-tmp-xar.sh redeploy-xar-package.sh delete-remote-tmp-xar.sh
+          distribution: 'liberica'
+          java-version: 11
+      - name: Bump Version Number
+        run: mvn versions:set -DnewVersion="$(date -u '+%Y.%m.%d').$(git rev-parse --short HEAD)"
+      - name: Build Deploy Scripts and Package
+        run: mvn package -DskipTests -Pbuild-deploy-scripts
+      - name: Set Deploy Scripts as executable
+        run: chmod +x target/classes/deploy-resources/upload-remote-tmp-xar.sh target/classes/deploy-resources/redeploy-xar-package.sh target/classes/deploy-resources/delete-remote-tmp-xar.sh
       - name: Upload temp XAR to Remote Database Server
         env:
           REMOTE_EDB_SERVER_USERNAME: ${{ secrets.REMOTE_EDB_SERVER_USERNAME }}
           REMOTE_EDB_SERVER_PASSWORD: ${{ secrets.REMOTE_EDB_SERVER_PASSWORD }}
           REMOTE_EDB_SERVER_URL: ${{ secrets.REMOTE_EDB_SERVER_URL }}
-        run: ./upload-remote-tmp-xar.sh
+        run: target/classes/deploy-resources/upload-remote-tmp-xar.sh
       - name: Redeploy XAR on Remote Database Server
         env:
           REMOTE_EDB_SERVER_USERNAME: ${{ secrets.REMOTE_EDB_SERVER_USERNAME }}
           REMOTE_EDB_SERVER_PASSWORD: ${{ secrets.REMOTE_EDB_SERVER_PASSWORD }}
           REMOTE_EDB_SERVER_URL: ${{ secrets.REMOTE_EDB_SERVER_URL }}
-        run: ./redeploy-xar-package.sh
+        run: target/classes/deploy-resources/redeploy-xar-package.sh
       - name: Delete temp XAR from Remote Database Server
         env:
           REMOTE_EDB_SERVER_USERNAME: ${{ secrets.REMOTE_EDB_SERVER_USERNAME }}
           REMOTE_EDB_SERVER_PASSWORD: ${{ secrets.REMOTE_EDB_SERVER_PASSWORD }}
           REMOTE_EDB_SERVER_URL: ${{ secrets.REMOTE_EDB_SERVER_URL }}
-        run: ./delete-remote-tmp-xar.sh
+        run: target/classes/deploy-resources/delete-remote-tmp-xar.sh
 

README.md

@@ -1,7 +1,7 @@
 # manuForma [BETA]
 
 [![Build Status](https://github.com/majlis-erc/manuForma/actions/workflows/ci.yml/badge.svg)](https://github.com/majlis-erc/manuForma/actions/workflows/ci.yml)
-[![Java 8+](https://img.shields.io/badge/java-8+-blue.svg)](https://bell-sw.com/pages/downloads/)
+[![Java 11+](https://img.shields.io/badge/java-11+-blue.svg)](https://bell-sw.com/pages/downloads/)
 [![DOI](https://zenodo.org/badge/474991717.svg)](https://zenodo.org/badge/latestdoi/474991717)
 
 The manuForma application is designed to make TEI data creation and distributed editing faster and easier. The application features easy to use multi-step forms, Github interactions and more.
@@ -58,7 +58,7 @@ To build the form you will simply need to run the XSLT, it will use the values d
 The manuForma application can be compiled into an EXPath Package for deployment to an Elemental (or eXist-db) server.
 
 Build Requirements:
-    * [Java JDK](https://bell-sw.com/pages/downloads/) version 8 (or newer)
+    * [Java JDK](https://bell-sw.com/pages/downloads/) version 11 (or newer)
 
 To build the manuForma application:
 
@@ -105,7 +105,7 @@ docker volume create manuforma-database
 Once you have built (or obtained) the Docker Image, you can run manuForma in Docker like so:
 
 ```shell
-docker run -it -p 8080:8080 --mount type=volume,src=manuforma-database,dst=/elemental/data majlis/manuforma:latest
+docker run -it -p 8080:8080 --mount type=volume,src=manuforma-database,dst=/elemental/data majlis-erc/manuforma:latest
 ```
 
 manuForma will then be available in your web-browser at `http://localhost:8080/exist/apps/manuForma/index.html`

pom.xml

@@ -265,20 +265,14 @@
         </profile>
 
         <profile>
-            <!-- NOTE(AR) Build the scripts needed for use in CI -->
-            <id>ci-resources</id>
-            <activation>
-                <property>
-                    <name>env.CI</name>
-                    <value>true</value>
-                </property>
-            </activation>
+            <!-- NOTE(AR) Build the scripts needed to deploy to the server -->
+            <id>build-deploy-scripts</id>
             <build>
                 <resources>
                     <resource>
-                        <directory>src/main/ci-resources</directory>
+                        <directory>src/main/deploy-resources</directory>
                         <filtering>true</filtering>
-                        <targetPath>ci-resources</targetPath>
+                        <targetPath>deploy-resources</targetPath>
                     </resource>
                 </resources>
             </build>