Merge branch 'dev'

.github/workflows/build-sass.yml

@@ -1,3 +1,19 @@
+# 
+# Copyright 2024 Cypriot Free Software Foundation
+#
+# Permission is hereby granted, free of charge, 
+# to any person obtaining a copy of this software and associated documentation files (the “Software”), 
+# to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, 
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 
 name: "release-sass"  
 
@@ -40,17 +56,6 @@ jobs:
             token: ${{ secrets.MY_SECRET_TOKEN }}
             force: true
 
-
-        - name: "Mark prelelease"
-          if: github.ref == 'refs/heads/dev'
-          run: |
-            npm version prerelease --preid=dev --no-commit-hooks --no-git-tag-version
-        
-        - name: "Minor Bump version"
-          if: github.ref == 'refs/heads/master'
-          run: |
-            npm version patch --no-commit-hooks --no-git-tag-version
-
         - name: commit built package.json
           uses: actions-x/commit@v6
           with:
@@ -75,16 +80,6 @@ jobs:
         - name: Make Css zip
           run: |
             zip -r cssonly.zip ./dist/*.css
-
-        - uses: "marvinpinto/action-automatic-releases@latest"
-          if: github.ref == 'refs/heads/dev'
-          with:
-            repo_token: "${{ secrets.GITHUB_TOKEN }}"
-            automatic_release_tag: "v${{ steps.version.outputs.version }}"
-            prerelease: true
-            title: "Development Build"
-            files: |
-              cssonly.zip
         
         - uses: "marvinpinto/action-automatic-releases@latest"
           if: github.ref == 'refs/heads/master'

.husky/pre-push

@@ -1,3 +1,20 @@
+# 
+# Copyright 2024 Cypriot Free Software Foundation
+#
+# Permission is hereby granted, free of charge, 
+# to any person obtaining a copy of this software and associated documentation files (the “Software”), 
+# to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, 
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
 #!/bin/bash
 
 test -n "$BASH_VERSION" || exec /bin/bash $0 "$@"
@@ -9,8 +26,8 @@ done
 
 current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
 
-if [ $current_branch == "dev" ]; then
-  echo "No bump needed upon dev"git 
+if [ $current_branch != "master" ]; then
+  echo "Ommiting version bump because current branch is ${current_branch}" 
   exit 0
 fi