added commit hash to version

Reviewed-on: #578

.gitea/workflows/laravel.yml

@@ -3,40 +3,55 @@ name: Laravel
 on:
     push:
         branches: ["main"]
+    pull_request:
 
 jobs:
     laravel-tests:
         runs-on: ubuntu-latest
 
         steps:
+            - uses: actions/checkout@v4
+            
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: "8.2"
-            - uses: actions/checkout@v3
+                  php-version: "8.4"
+            
             - name: Copy .env
               run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-            - name: Install Dependencies
+            
+            - name: Install PHP Dependencies
               run: composer install -q --no-interaction --no-progress --prefer-dist
+            
             - name: Generate key
               run: php artisan key:generate
+            
             - name: Directory Permissions
               run: chmod -R 777 storage bootstrap/cache
+            
             - name: Create Database
               run: |
                   mkdir -p database
                   touch database/database.sqlite
-            - name: Execute tests (Unit and Feature tests) via PHPUnit
+            
+            - name: Install Node.js
+              uses: actions/setup-node@v2
+              with:
+                  node-version: "20"
+            
+            - name: Install Node dependencies
+              run: npm ci
+              
+            - name: Build frontend
+              run: npm run build
+  
+            - name: Run migrations
+              env:
+                DB_CONNECTION: sqlite
+                DB_DATABASE: database/database.sqlite
+              run: php artisan migrate --force
+  
+            - name: Run PHPUnit
               env:
                   DB_CONNECTION: sqlite
                   DB_DATABASE: database/database.sqlite
               run: vendor/bin/phpunit
-            - name: Install Node.js
-              uses: actions/setup-node@v2
-              with:
-                  node-version: "16.x"
-            - name: Install dependencies
-              run: npm ci
-            - name: Run Vue tests
-              env:
-                  LARAVEL_BYPASS_ENV_CHECK: "1"
-              run: npm run test

.gitea/workflows/renovate.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:43.2.1
+    container: ghcr.io/renovatebot/renovate:43.2.4
     steps:
       - uses: actions/checkout@v4
 

.github/dependabot.yml

@@ -1,15 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "composer"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/dependency-update.yml

@@ -1,63 +0,0 @@
-name: Dependency Update
-
-on:
-  schedule:
-    - cron: "0 20 * * 1" # Mondays 20:00 UTC
-  workflow_dispatch: {}
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: "8.4"
-          tools: composer:v2
-
-      - name: Install current deps
-        run: |
-          npm ci
-          composer install --no-interaction --no-progress
-
-      - name: Update deps
-        run: |
-          npm update
-          composer update --no-interaction --no-progress
-
-      - name: Detect changes
-        id: changes
-        run: |
-          if git diff --quiet; then
-            echo "changed=false" >> "$GITHUB_OUTPUT"
-          else
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      # - name: Create PR
-      #   if: steps.changes.outputs.changed == 'true'
-      #   uses: peter-evans/create-pull-request@v6
-      #   with:
-      #     commit-message: "Dependency update"
-      #     title: "Dependency update"
-      #     body: "Automated dependency update."
-      #     branch: "bot/dependency-update"
-      #     delete-branch: true
-
-      - name: Commit and push
-        if: steps.changes.outputs.changed == 'true'
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git commit -am "Dependency update"
-          git push origin HEAD:main

.github/workflows/laravel.yml

@@ -1,42 +0,0 @@
-name: Laravel
-
-on:
-    push:
-        branches: ["main"]
-
-jobs:
-    laravel-tests:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: shivammathur/setup-php@v2
-              with:
-                  php-version: "8.2"
-            - uses: actions/checkout@v3
-            - name: Copy .env
-              run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-            - name: Install Dependencies
-              run: composer install -q --no-interaction --no-progress --prefer-dist
-            - name: Generate key
-              run: php artisan key:generate
-            - name: Directory Permissions
-              run: chmod -R 777 storage bootstrap/cache
-            - name: Create Database
-              run: |
-                  mkdir -p database
-                  touch database/database.sqlite
-            - name: Execute tests (Unit and Feature tests) via PHPUnit
-              env:
-                  DB_CONNECTION: sqlite
-                  DB_DATABASE: database/database.sqlite
-              run: vendor/bin/phpunit
-            - name: Install Node.js
-              uses: actions/setup-node@v2
-              with:
-                  node-version: "16.x"
-            - name: Install dependencies
-              run: npm ci
-            - name: Run Vue tests
-              env:
-                  LARAVEL_BYPASS_ENV_CHECK: "1"
-              run: npm run test

.gitignore

@@ -260,3 +260,5 @@ phpcbf.phar
 ### PHPStorm ###
 .idea/
 
+### Deployment ###
+/deploy.sh

app/Http/Controllers/HomeController.php

@@ -9,11 +9,11 @@ class HomeController extends Controller
 {
     public function index()
     {
-        $posts = Post::query()->orderBy('created_at', 'desc')->limit(4)->get();
+        // $posts = Post::query()->orderBy('created_at', 'desc')->limit(4)->get();
         $workshops = Workshop::query()->where('starts_at', '>', now())->where('status', '!=', 'private')->orderBy('starts_at', 'asc')->limit(4)->get();
 
         return view('home', [
-            'posts' => $posts,
+            // 'posts' => $posts,
             'workshops' => $workshops,
         ]);
     }

config/app.php

@@ -123,5 +123,7 @@ return [
         'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
 
-    'notice' => env('APP_NOTICE', '')
+    'notice' => env('APP_NOTICE', ''),
+    'version' => env('APP_VERSION', 'dev'),
+    'commit' => env('APP_COMMIT', ''),
 ];

renovate.json

@@ -1,11 +1,24 @@
 {
-  "extends": [
-    "config:base"  
-  ],
-  "packageRules": [
-    {
-      "updateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    }
-  ]
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:recommended"
+    ],
+    "automerge": true,
+    "platformAutomerge": true,
+    "ignoreTests": true,
+    "packageRules": [
+        {
+            "matchUpdateTypes": [
+                "patch"
+            ],
+            "automerge": true
+        },
+        {
+            "matchUpdateTypes": [
+                "minor",
+                "major"
+            ],
+            "automerge": false
+        }
+    ]
 }

resources/views/components/footer.blade.php

@@ -2,7 +2,9 @@
     <section class="flex flex-col sm:flex-row gap-8 sm:gap-4 mb-12">
         <div class="text-center sm:text-left sm:w-2/3 text-sm self-center sm:pr-8">STEMMechanics Australia acknowledges the Traditional Owners of Country throughout Australia and the continuing connection to land, cultures and communities. We pay our respect to Aboriginal and Torres Strait Islander cultures; and to Elders both past, present and emerging.</div>
         <ul class="sm:w-1/3 flex flex-col gap-0.5 text-center sm:text-left">
-            <li><h3 class="font-bold mb-2">Community</h3></li>
+            <li>
+                <h3 class="font-bold mb-2">Community</h3>
+            </li>
             <li><a href="https://github.com/stemmechanics" class="text-sm hover:text-primary-color">GitHub</a></li>
             <li><a href="https://discord.gg/yNzk4x7mpD" class="text-sm hover:text-primary-color">Discord</a></li>
             <li><a href="https://www.facebook.com/stemmechanics" class="text-sm hover:text-primary-color">Facebook</a></li>
@@ -11,7 +13,9 @@
             <li><a href="https://youtube.com/@STEMMechanics" class="text-sm hover:text-primary-color">YouTube</a></li>
         </ul>
         <ul class="sm:w-1/3 flex flex-col gap-0.5 text-center sm:text-left">
-            <li><h3 class="font-bold mb-2">STEMMechanics</h3></li>
+            <li>
+                <h3 class="font-bold mb-2">STEMMechanics</h3>
+            </li>
             <li><a href="{{ route('about') }}" class="text-sm hover:text-primary-color">About</a></li>
             <li><a href="{{ route('contact') }}" class="text-sm hover:text-primary-color">Contact Us</a></li>
             <li><a href="{{ route('code-of-conduct') }}" class="text-sm hover:text-primary-color">Code of Conduct</a></li>
@@ -21,6 +25,13 @@
     </section>
     <section class="border-t border-t-gray-600 pt-8 flex justify-between text-xs items-center flex-col sm:flex-row">
         <div class="mb-3 sm:mb-0">@includeSVG('logo.svg', 'width:10rem;margin-top:-0.2rem;color:#DDD')</div>
-        <div>Made with ❤️&nbsp;© {{ date('Y') }} STEMMechanics</div>
+        @php $commit = config('app.commit'); @endphp
+        <div>
+            Made with ❤️&nbsp;© {{ date('Y') }} STEMMechanics
+            • v{{ config('app.version') }}
+            @if(!empty($commit))
+                ({{ substr($commit, 0, 10) }})
+            @endif
+        </div>
     </section>
 </footer>