From 50822d9e135b462604cae74bcfcc7ea6025328c9 Mon Sep 17 00:00:00 2001
From: cloud0x42 <bojankostadinov@gmail.com>
Date: Tue, 14 Oct 2025 21:49:31 +0200
Subject: [PATCH 1/2] Add test script

---
 README.md     |  3 ++-
 tests/test.sh | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100755 tests/test.sh

diff --git a/README.md b/README.md
index 98e512d..d23d1e6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # Git demo
 
 
-This project contains 5 bash scripts, and 3 branches we can use for testing.
+This project contains 5 bash scripts, and 3 branches we can use for testing. The testing script validates that the **scripts/** directory contains executable .sh files.
+
diff --git a/tests/test.sh b/tests/test.sh
new file mode 100755
index 0000000..0d072ae
--- /dev/null
+++ b/tests/test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# validate that the scripts folder only has .sh files
+if [[ $(find scripts -type f -not -name "*.sh") ]]; then
+  echo "Error: scripts folder contains non-bash files"
+  exit 1
+fi
+
+# validate all scripts are executable
+for file in scripts/*.sh; do
+  if [[ ! -x "$file" ]]; then
+    echo "Error: $file is not executable"
+    exit 1
+  fi
+done
-- 
2.49.1


From d8b75c8a683b9b98b2624c301696c26899a0c324 Mon Sep 17 00:00:00 2001
From: Mario Luka Nanovski <nanovski.a24117@next.edu.mk>
Date: Wed, 22 Oct 2025 09:52:41 +0000
Subject: [PATCH 2/2] Rebasing

---
 .gitea/workflows/ci.yaml | 23 +++++++++++++++++++++++
 README.md                |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 .gitea/workflows/ci.yaml

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
new file mode 100644
index 0000000..7784a52
--- /dev/null
+++ b/.gitea/workflows/ci.yaml
@@ -0,0 +1,23 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
diff --git a/README.md b/README.md
index d23d1e6..ec8ab72 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Git demo
 
 
+<<<<<<< HEAD
 This project contains 5 bash scripts, and 3 branches we can use for testing. The testing script validates that the **scripts/** directory contains executable .sh files.
+=======
+This project contains 5 bash scripts, and 3 branches we can use for testing. It also contains an example gitea workflow.
+>>>>>>> 0f8c583 (Add demo workflow)
 
-- 
2.49.1