Merge pull request #3 from Xpirix/fix_minor_issues

Fix minor issues

Author: Xpirix

.github/workflows/build-push-images-latest.yaml

@@ -1,87 +1,39 @@
-name: release-build
+name: Build and Push Docker Image on release
 on:
   workflow_dispatch:
     inputs:
       tags:
         description: 'Git tag to use'
-  release:
-    types:
-      - released
   push:
     tags:
       - '*.*.*.'
       - 'v*.*.*.'
 jobs:
   docker-builder-run-on-tag:
-    if: ${{ github.event.inputs.tags }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.tags }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+      - uses: actions/checkout@v4
+    
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: deployment/docker/Dockerfile
-          push: true
-          target: prod
-          tags: ${{ secrets.DOCKERHUB_REPO }}/projecta-uwsgi:${{ github.event.inputs.tags }}
-          cache-from: type=gha,scope=prod
-          cache-to: type=gha,scope=prod
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        uses: docker/setup-buildx-action@v3
 
-  docker-builder-run-on-tag-release:
-    if: ${{ !github.event.inputs.tags }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ secrets.DOCKERHUB_REPO }}/projecta-uwsgi
-          tags: |
-            type=semver,pattern={{version}}
-            type=ref,event=branch
-            type=ref,event=pr
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: deployment/docker/Dockerfile
           push: true
           target: prod
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=gha,scope=prod
-          cache-to: type=gha,scope=prod
+          tags: |
+            qgis/qgis-changelog-uwsgi:${{ github.ref_name }}
+            qgis/qgis-changelog-uwsgi:latest
+      
+      - name: Log out from Docker Hub
+        run: docker logout
 
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/build-push-images-release.yaml

@@ -0,0 +1,59 @@
+name: latest-build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+          - '3.13'
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+
+      - name: Test installing development dependencies
+        working-directory: deployment/docker
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r REQUIREMENTS-dev.txt
+
+      - name: Run Flake8 test
+        run: flake8 .
+
+  test:
+    runs-on: ubuntu-latest
+    needs:
+      - lint
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run docker compose services
+        working-directory: deployment
+        run: |
+          echo "Override docker compose for testing purposes"
+          cp .env.example .env
+          cp docker-compose.test.yml docker-compose.override.yml
+          make build-devweb
+          make devweb
+          make wait-db
+          make create-test-db
+
+      - name: Run tests
+        working-directory: deployment
+        run: |
+          docker compose exec -T devweb bash -c '
+            set -e  # Exit immediately if any command fails
+            python manage.py makemigrations &&
+            python manage.py migrate &&
+            python manage.py collectstatic --noinput --verbosity 0 &&
+            python manage.py test
+          '

.github/workflows/build-push-images-stable.yaml

@@ -63,6 +63,8 @@ DEFAULT_FROM_EMAIL=''
 # Stripe
 STRIPE_LIVE_SECRET_KEY='sk_live_key'
 STRIPE_LIVE_PUBLIC_KEY='pk_live_key'
+STRIPE_TEST_SECRET_KEY='sk_test_key'
+STRIPE_TEST_PUBLIC_KEY='pk_test_key'
 STRIPE_LIVE_MODE=True
 DJSTRIPE_WEBHOOK_SECRET='whsec_'
 # SENTRY