Merge branch 'staging'

hotosm · Nov 8, 2023 · dbeeb9d · dbeeb9d
2 parents 761366e + bffc2fe
commit dbeeb9d
Show file tree

Hide file tree

Showing 9 changed files with 509 additions and 8 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -94,10 +94,13 @@ jobs:
           # Migrate db first, so api works
           docker compose up migrations --exit-code-from migrations
 
-          # Run without migrations (give exit code 0)
+          # Run without migrations (give exit code 0), or api
           docker compose up -d \
             --no-deps --wait --wait-timeout 60 \
-            central-db central central-proxy s3 api
+            central-db central central-proxy s3
+
+          # Start api attached to view logs
+          docker compose up --no-deps --wait --wait-timeout 60 api
 
   smoke-test-frontend:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build_ci_img.yml b/.github/workflows/build_ci_img.yml
@@ -31,5 +31,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          gh actions-cache delete image-cache-${{ runner.os }} -R \
-            ${{ github.repository }} -B ${{ github.ref_name }} --confirm
+          gh actions-cache delete image-cache-${{ runner.os }} 
+            -R ${{ github.repository }} \
+            -B ${{ github.ref_name }} \
+            --confirm || true
diff --git a/.github/workflows/tag_build.yml b/.github/workflows/tag_build.yml
@@ -1,10 +1,6 @@
 name: 🔧 Build Tag & Release Images
 
 on:
-  # Any tag push
-  push:
-    tags:
-      - "*"
   # All releases
   release:
     types: [published]

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,6 +32,7 @@ repos:
             --ignore-unknown,
             --no-error-on-unmatched-pattern,
             "!chart/**",
+            "!CHANGELOG.md",
             "!src/frontend/pnpm-lock.yaml",
           ]