Merge pull request #1232 from SciCatProject/master

Release 03-06-2024

.github/ISSUE_TEMPLATE/issue-template.md

@@ -4,16 +4,22 @@ about: Describe this issue purpose here.
 
 ---
 
-## Issue Name
+## Issue Name (title)
+Please enter the title for this github issue
 
 ### Summary
+Description of the issue
 
 ### Steps to Reproduce
+Describe how to reproduce the issue
 
 ### Current Behaviour
+Describe the current behavior if it is relevant
 
 ### Expected Behaviour
+Describe the expected behavior if it is relevant
 
-### Extra Details
+### Details
+Provide all the details related to this issue. Also include screenshots, wireframes or mockups if they help.
 
-Here you should include details about the system (if it is unique) and possible information about a fix (feel free to link to code where relevant). Screenshots/GIFs are also fine here.
+__PS__: make sure to add the proper tags to the issue

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,17 +7,25 @@ Short description of the pull request
 Background on use case, changes needed
 
 ## Fixes:
+Please provide a list of the fixes implemented by this PR
 
 * Items added
 
 ## Changes:
+Please provide a list of the changes implemented by this PR
 
 * changes made
 
-## Tests included/Docs Updated?
+## Tests included
 
 - [ ] Included for each change/fix?
 - [ ] Passing? (Merge will not be approved unless this is checked) 
-- [ ] Docs updated?
-- [ ] New packages used/requires npm install? 
-- [ ] Toggle added for new features?
+
+## Documentation
+- [ ] swagger documentation updated \[required\]
+- [ ] official documentation updated \[nice-to-have]
+
+### official documentation info
+If you have updated the official documentation, please provide PR # and URL of the pages where the updates are included
+
+

.github/workflows/auto-merge-dependabot.yaml

@@ -15,7 +15,7 @@ jobs:
       ## Extract information about the dependencies being updated by a Dependabot-generated PR
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/deploy.yml

@@ -2,8 +2,8 @@ name: Deploy
 
 on:
   push:
-    branches: 
-    - master
+    branches:
+      - master
 
 jobs:
   deploy:
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -22,22 +22,23 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Create image tags
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/scicatproject/backend-next
           flavor: latest=true # adds :latest tag to outputs.tags
           tags: type=sha,format=long,prefix= # adds :<sha> tag to outputs.tags
-        
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-            
+
       - name: Trigger ESS pipeline
         uses: swapActions/trigger-swap-deployment@v1
         with:

.github/workflows/github-tag-and-release.yml

@@ -59,7 +59,7 @@ jobs:
       ## https://github.com/docker/metadata-action
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/scicatproject/backend-next
           tags: |