Merge pull request #77 from digital-land/feature/pipeline-strategy

Feature/pipeline strategy

Author: Michael

.github/workflows/ecr-dev-deploy.yml .github/workflows/deploy.yml.github/workflows/ecr-dev-deploy.yml renamed to .github/workflows/deploy.yml

@@ -11,31 +11,12 @@ on:
         description: The environment to deploy to.
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yml
   detect-environments:
-    runs-on: ubuntu-latest
-    outputs:
-      environments: ${{ steps.environments.outputs.result }}
-    steps:
-      - uses: actions/github-script@v6
-        id: environments
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          result-encoding: json
-          script: |
-            const allowed = ['development', 'staging', 'production'];
-
-            if (context.payload?.inputs?.environment) {
-              return allowed.includes(context.payload.inputs.environment)
-                ? [context.payload.inputs.environment]
-                : [];
-            }
-
-            const { data: { environments } } = await github.rest.repos.getAllEnvironments({
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-
-            return environments.map(e => e.name).filter(name => allowed.includes(name));
+    uses: ./.github/workflows/detect-environments.yml
+    with:
+      environment: ${{ github.event.inputs.environment }}
 
   deploy:
     runs-on: ubuntu-latest

.github/workflows/detect-environments.yml

@@ -0,0 +1,44 @@
+name: Detect Environment to Deploy
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        description: "The environment to deploy(Optional)"
+        required: false
+        type: string
+    outputs:
+      environments:
+        description: "List of environment names"
+        value: ${{ jobs.run.outputs.environments }}
+
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+
+    outputs:
+      environments: ${{ steps.environments.outputs.result }}
+
+    steps:
+      - uses: actions/github-script@v6
+        id: environments
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          result-encoding: json
+          script: |
+            const allowed = ['development', 'staging', 'production'];
+            // If triggered manually with an environment in the allowed array, return it
+            if (context.payload?.inputs?.environment) {
+              const env = context.payload.inputs.environment
+              return allowed.includes(env) ? [env] : [];
+            }
+
+            // fetch all repo environments
+            const { data: { environments } } = await github.rest.repos.getAllEnvironments({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+
+            // Otherwise fetch all defined GitHub Environments
+            return environments.map(e => e.name).filter(name => allowed.includes(name));

.github/workflows/test.yaml

@@ -0,0 +1,85 @@
+name: Test
+run-name: Test - ${{ github.head_ref || github.ref_name }} by @${{ github.actor }}
+
+on:
+  push:
+    branches-ignore: [main]
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - run: make init
+      - run: make lint
+
+  test:
+    runs-on: ubuntu-22.04
+    services:
+      postgres:
+        image: postgres:16.2-alpine
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    env:
+      DATABASE_URL: postgresql://postgres:postgres@localhost/config_manager
+      ENVIRONMENT: development
+      PGPASSWORD: postgres
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - run: make init
+
+      - name: Setup database
+        run: |
+          psql -h localhost -c "CREATE DATABASE config_manager WITH TEMPLATE postgres" -U postgres
+
+      - name: Unit Tests
+        run: |
+          make test-unit
+          echo "## Unit Tests" >> $GITHUB_STEP_SUMMARY
+          # cat unit-tests.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Integration Tests
+        run: |
+          make test-integration
+          echo "## Integration Tests" >> $GITHUB_STEP_SUMMARY
+          # cat integration-tests.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Acceptance Tests
+        run: |
+          make test-acceptance
+          echo "## Acceptance Tests" >> $GITHUB_STEP_SUMMARY
+          # cat acceptance-tests.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Accessibility Tests
+        run: |
+          make test-accessibility
+          echo "## Accessibility Tests" >> $GITHUB_STEP_SUMMARY
+          # cat accessibility-tests.md >> $GITHUB_STEP_SUMMARY
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30

Makefile

@@ -47,3 +47,19 @@ load-data:
 
 drop-data:
 	flask data drop
+
+test-unit:
+	@echo "Running Unit test...."
+	@echo "Not yet implemented"
+
+test-integration:
+	@echo "Running Integration test...."
+	@echo "Not yet implemented"
+
+test-acceptance:
+	@echo "Running Acceptance test...."
+	@echo "Not yet implemented"
+
+test-accessibility:
+	@echo "Running Accessibility test...."
+	@echo "Not yet implemented"