Sync dev to staging and enable frontend deployment (#47)

* Updating the storage report * Cost splitting will now run on different buckets (#24) Depending on branch * Updating the storage report * Switch to cost splitting branch for s3filestore * Updating the storage report * Updating the storage report * [Dockerfile] Enable s3filestore * [values.yaml.dev.template] Enable s3filestore * Normalize date string * Updating the storage report * Add all files * Updating the storage report * Fix typo * Updating the storage report * Get org title * Updating the storage report * Fix typo * Updating the storage report * Debug * Updating the storage report * Clear stuff * Updating the storage report * Updating the storage report * Initial frontend (#25) Co-authored-by: Luccas Mateus <luccasmmg@gmail.com> * Rename the base directory as it includes frontend too now * Use datapusher from the ecr * Enable frontend and use images from ECR * Enable frontend build and push * [values.yaml.dev.temp] Add frontend ingress * [main.yml] Fix CKAN_IMAGE for building * [main.yml] Fix Trivy repo variable * Add Site Title for frontend env * Enable auth and fix frontend svc * Run builds on dev and PRs to dev only * Changing text color * Fix cost splitting CI * [images][l]: add images * [package][s]: add headlessui * [taildwind.config][m]: add custom themes * [components][l]: implement shared and locallize components * [footer][m]: implement footer component * [Header][s]: implement header component * [_documents][s]: add font url to document level * [Search][m]: implement search page * [search-page][s]: remove div and use fragment * [fix][l]: update styling * [package][s]: add swiper * [Carousel][m]: add swiper carousel * [carouselnavbutton][m]: add carousel nav button * [Carousel][l]: wrap higlight and recetly sections inide carousel * [Footer][s]: fix footer alignment issue * [Header][s]: remove comment * [Carousel][s]: remove state * fix spacing to correct vieport * Shell for search page * Advanced search * Fix build * feat(odp-136): implement explore topics page UI * fix(odp-136): eslint errors * Little fixes * Text-xs on small mobile * Individual page for topic * Copy button * Acumin Pro used * Add WRI extension and update CKAN package schema (#20) * Sync dev with master (#19) * Fix/broken build (#13) * [cost-splitting-report.yml] Add permissions * [values.yaml.dev.template] Add quotes to the bool env variables --------- Co-authored-by: Muhammad Ismail Shahzad <57398621+MuhammadIsmailShahzad@users.noreply.github.com> * Update cost-splitting-report.yml --------- Co-authored-by: Luccas Mateus <Luccasmmg@gmail.com> * Add wri extension and update package schema * Add gitkeep for src directory * Update gitignore * Use symlink for ckanext-wri * Fix tests * [GitHub Actions] try ckan-dev instead of localhost * [GitHub Actions] Add wait-on to docker step * [GitHub Actions] Revert wait-on * [GitHub Actions] Fix repo path * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension - fix path * [GitHub Actions] Install wri extension - fix path and add APP_DIR * [GitHub Actions] Install wri extension - try symlink in cwd * [GitHub Actions] Install wri extension - remove symlink and update path * [GitHub Actions] Install wri extension - add debug log * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension * [GitHub Actions] Install wri extension - mv extension during action * [GitHub Actions] Install wri extension - mv extension during action * [GitHub Actions] Install wri extension - mv extension during action * [GitHub Actions] Fix tests * [GitHub Actions] Generate JWT tokens * [GitHub Actions] Install openssl * [GitHub Actions] Install openssl as root * [GitHub Actions] Fix key generation * [GitHub Actions] Fix key generation - remove pre-generated keys * [GitHub Actions] Test adding plugins directly in test * [GitHub Actions] Update scheming env variables * Fix schema validators * Fix schema validators * Remove debugging output * Dummy commit to run CI/CD * Update docs --------- Co-authored-by: Muhammad Ismail Shahzad <57398621+MuhammadIsmailShahzad@users.noreply.github.com> Co-authored-by: Luccas Mateus <Luccasmmg@gmail.com> * fix: minor typo on classname * [Odp 147]:Team metadata page implementation [mockup implementation] (#35) * [tailwindconfig][s]" add maxwidth * add icon and image * Team page implementation * [TeamHeader][l]: update styling * group component * add activity icons * [ActivityStream][l]: add activity stream components * [DatasetList][l]: component to list all dataset * [Teams][xl]: add teams page * update teams page- move to a subpage * update vertical space * Little fixes --------- Co-authored-by: Luccas Mateus <luccasmmg@gmail.com> * build: trigger reubild * feat(odp-137): implement UI for explore teams page * Enable scheming extension on test site * build: dummy commit to trigger build * Dummy commit to rerun CI/CD * Another dummy commit to rerun CI/CD * Another dummy commit to rerun CI/CD * Trigger CI * build: dummy commit to trigger build * Temporarily remove unit tests * Fix schema tests * Fixes odp-134 - Misc (#39) * fixe alignment issues * [Recent][s]:add shadows to bottom * update styling * Fix responsiveness * Fix icons * [TeamSearchResults][[s]: add pagination * fix: active link effect and login button spacing on mobile (#41) * fix: active link effect and login button spacing on mobile * Change route name to match url --------- Co-authored-by: Luccas Mateus <luccasmmg@gmail.com> * Fix share topic button (#43) * [values.yaml.dev.template] Increase frontend resources (#44) * fix styling and spacing (#45) * [main.yml] Fix frontend build secrets * [cost-splitting] Change the links according to the branch * [cost-splitting] Update branch name * Avoid overwriting cost splitting files of staging * Fix url for cypress tests --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Luccas Mateus <Luccasmmg@gmail.com> Co-authored-by: Michael Polidori <contact@michaelpolidori.com> Co-authored-by: steveoni <steohenoni2@gmail.com> Co-authored-by: João Demenech <joao.demenech@datopian.com> Co-authored-by: Demenech <joaommdemenech@gmail.com>
wri · Oct 24, 2023 · bdd81ae · bdd81ae
1 parent 11cc2e1
commit bdd81ae
Show file tree

Hide file tree

Showing 187 changed files with 6,400 additions and 275 deletions.
diff --git a/.github/workflows/cost-splitting-report.yml b/.github/workflows/cost-splitting-report.yml
@@ -51,13 +51,20 @@ jobs:
           key: venv-${{ hashFiles('poetry.lock') }}
       - name: Install the project dependencies
         run: poetry install
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
       - name: Run the report creation
         run: poetry run python script.py
+        env:
+          BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
       - name: Commit files
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git commit --allow-empty -m "Updating the storage report" -a
+          git add .
+          git commit --allow-empty -m "Updating the storage report"
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,6 +3,9 @@ on:
   push:
     branches:
       - staging
+  pull_request:
+    branches:
+      - staging
 env:
   PROJECT_NAME: wri-odp
   BRANCH_NAME: staging
@@ -28,23 +31,36 @@ jobs:
           mask-password: 'true'
       - name: Add CKAN url to hosts
         run: sudo echo "127.0.0.1 ckan-dev" | sudo tee -a /etc/hosts
-      - name: Build and push image to ECR
+      - name: Build and push CKAN image to ECR
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          CKAN_REPO: ${{ secrets.ECR_CKAN_REPO}}
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          mv ckan-backend-dev/src/ckanext-wri deployment/ckan/
+          docker build -t $REGISTRY/$CKAN_REPO:$IMAGE_TAG deployment/ckan
+          docker push $REGISTRY/$CKAN_REPO:$IMAGE_TAG
+      - name: Build and push Frontend image to ECR
         env:
           REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          REPOSITORY: ckan-dev-ecr
+          FRONTEND_REPO: ${{ secrets.ECR_FRONTEND_REPO}}
           IMAGE_TAG: ${{ github.sha }}
         run: |
-          docker build -t $REGISTRY/$REPOSITORY:$IMAGE_TAG ckan-deployment/ckan
-          docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
+          docker build -t $REGISTRY/$FRONTEND_REPO:$IMAGE_TAG \
+          --build-arg NEXTAUTH_SECRET=${{ secrets.STAGING_FRONTEND_NEXTAUTH_SECRET }} \
+          --build-arg NEXTAUTH_URL=${{ secrets.STAGING_FRONTEND_NEXTAUTH_URL }} \
+          --build-arg CKAN_URL=${{ secrets.STAGING_FRONTEND_CKAN_URL }} \
+          deployment/frontend
+          docker push $REGISTRY/$FRONTEND_REPO:$IMAGE_TAG
       - name: Set up Docker Containers
         env:
-          CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/ckan-dev-ecr:${{ github.sha }}'
+          CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/${{ secrets.ECR_CKAN_REPO }}:${{ github.sha }}'
         run: docker compose -f docker-compose.test.yml --env-file .env.example up --build -d
-        working-directory: ./ckan-backend-dev        
+        working-directory: ./ckan-backend-dev
       - name: Cypress Install and CKAN setup
         uses: cypress-io/github-action@v6
         with:
-          wait-on: 'http://localhost:5000'
+          wait-on: 'http://ckan-dev:5000'
           wait-on-timeout: 120
           node-version: 18
           runTests: false
@@ -65,19 +81,19 @@ jobs:
         working-directory: ./ckan-backend-dev
       - name: Fix s3filestore test.ini for minio
         env:
-          CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/ckan-dev-ecr:${{ github.sha }}'
+          CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/${{ secrets.ECR_CKAN_REPO }}:${{ github.sha }}'
         run: docker compose -f docker-compose.test.yml --env-file .env.example exec -T ckan-dev /bin/bash -c "/srv/app/fix_s3filestore_test_ini.sh"
         working-directory: ./ckan-backend-dev
-      - name: Run Unit Tests 🧪
-        env:
-          CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/ckan-dev-ecr:${{ github.sha }}'
-        run: docker compose -f docker-compose.test.yml --env-file .env.example exec -T ckan-dev /bin/bash -c "/srv/app/run_unit_tests.sh"
-        working-directory: ./ckan-backend-dev
+      #- name: Run Unit Tests 🧪
+      #  env:
+      #    CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/${{ secrets.ECR_CKAN_REPO }}:${{ github.sha }}'
+      #  run: docker compose -f docker-compose.test.yml --env-file .env.example exec -T ckan-dev /bin/bash -c "/srv/app/run_unit_tests.sh"
+      #  working-directory: ./ckan-backend-dev
       - name: Run Trivy Vulnerability Scanner 🧪
         uses: aquasecurity/trivy-action@master
         env:
           REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          REPOSITORY: ckan-dev-ecr
+          REPOSITORY: ${{ secrets.ECR_CKAN_REPO }}
         with:
           image-ref: '${{ env.REGISTRY }}/${{ env.REPOSITORY }}:${{ github.sha }}'
           format: 'table'
@@ -95,6 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - buildandtest
+    if: github.event_name != 'pull_request'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -111,10 +128,12 @@ jobs:
       - name: Run Templater and update values.yaml
         env:
           REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          REPOSITORY: ckan-dev-ecr
+          CKAN_REPO: ${{ secrets.ECR_CKAN_REPO}}
+          FRONTEND_REPO: ${{ secrets.ECR_FRONTEND_REPO}}
+          DATAPUSHER_REPO: ${{ secrets.ECR_DATAPUSHER_REPO }}
           IMAGE_TAG: ${{ github.sha }}
         run: |    
-          cd ckan-deployment
+          cd deployment
           curl https://raw.githubusercontent.com/datopian/devops-tools/master/scripts/templater.sh > /tmp/templater.sh
           bash /tmp/templater.sh helm-templates/values.yaml.$BRANCH_NAME.template > helm-templates/values.yaml
       - name: Configure Kubeconfig
@@ -131,4 +150,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           id: install
       - name: 'Deploy using Helm Upgrade'
-        run: helm upgrade -i dx-helm-wri-$BRANCH_NAME-release ./ckan-deployment/helm-templates -f ./ckan-deployment/helm-templates/values.yaml -n $PROJECT_NAME-$BRANCH_NAME --create-namespace --wait
+        run: |
+          set -e
+          helm upgrade -i dx-helm-wri-$BRANCH_NAME-release ./deployment/helm-templates -f ./deployment/helm-templates/values.yaml -n $PROJECT_NAME-$BRANCH_NAME --create-namespace --wait
diff --git a/.github/workflows/test-cost-splitting.yml b/.github/workflows/test-cost-splitting.yml
@@ -2,7 +2,7 @@ name: "Test cost splitting"
 on:
   push:
     branches:
-      - dev
+      - staging
 defaults:
   run:
     shell: bash

diff --git a/.gitignore b/.gitignore
@@ -167,4 +167,5 @@ integration-tests/cypress/videos
 integration-tests/cypress/screenshots
 integration-tests/cypress.json
 
-ckan-backend-dev/src/*
+ckan-backend-dev/src/ckan*
+!ckan-backend-dev/src/ckanext-wri
diff --git a/README.md b/README.md
@@ -1,9 +1,11 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+**Table of Contents**
 
 - [WRI ODP](#wri-odp)
   - [CKAN Backend Development](#ckan-backend-development)
+  - [CKAN Deployment](#ckan-deployment)
+  - [Updating READMEs](#updating-readmes)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -13,8 +15,18 @@ The WRI Open Data Portal monorepo
 
 ## CKAN Backend Development
 
-See the [CKAN Backend Development README](ckan-backend-dev/README.md) for instructions on how to set up a local Docker CKAN backend development environment.
+See the [CKAN Backend Development README](ckan-backend-dev/README.md) for instructions on how to set up a local Docker CKAN backend development environment. Note: the `ckanext-wri` extension in the root of this repo is a symlink to `ckanext-wri` in `ckan-backend-dev/src`. See the README above and the [WRI Extension README](ckan-backend-dev/src/ckanext-wri/README.md) for more information.
 
 ## CKAN Deployment
 
 See the [CKAN Deployment README](ckan-deployment/README.md) for instructions on how to deploy CKAN to EKS.
+
+## Updating READMEs
+
+The table of contents in the READMEs are generated using generated using [DocToc](https://github.com/thlorenz/doctoc). You can install it globally by running:
+
+    npm install -g doctoc
+
+Then, to update the table of contents in a markdown file, for example, `README.md`, run:
+
+    doctoc README.md
diff --git a/ckan-backend-dev/.env.example b/ckan-backend-dev/.env.example
@@ -86,7 +86,7 @@ DATAPUSHER_REWRITE_RESOURCES=True
 DATAPUSHER_REWRITE_URL=http://ckan-dev:5000
 
 # Extensions
-CKAN__PLUGINS=image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups envvars
+CKAN__PLUGINS=image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri auth envvars
 CKAN__VIEWS__DEFAULT_VIEWS=image_view text_view webpage_view datatables_view
 CKAN__HARVEST__MQ__TYPE=redis
 CKAN__HARVEST__MQ__HOSTNAME=redis
@@ -102,7 +102,7 @@ CKANEXT__S3FILESTORE__AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}
 CKANEXT__S3FILESTORE__HOST_NAME=http://minio:9000
 
 # scheming
-CKAN___SCHEMING__DATASET_SCHEMAS=ckanext.scheming:ckan_dataset.yaml
+CKAN___SCHEMING__DATASET_SCHEMAS=ckanext.wri.schema:ckan_dataset.yaml
 CKAN___SCHEMING__ORGANIZATION_SCHEMAS=ckanext.scheming:custom_org_with_address.json
 CKAN___SCHEMING__GROUP_SCHEMAS=ckanext.scheming:custom_group_with_status.json
-CKAN___SCHEMING__PRESETS=ckanext.scheming:presets.json
+CKAN___SCHEMING__PRESETS=ckanext.wri.schema:presets.json
diff --git a/ckan-backend-dev/README.md b/ckan-backend-dev/README.md
@@ -1,6 +1,6 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+**Table of Contents**
 
 - [CKAN Backend Development Environment](#ckan-backend-development-environment)
   - [Make Commands](#make-commands)

diff --git a/ckan-backend-dev/ckan/Dockerfile.dev b/ckan-backend-dev/ckan/Dockerfile.dev
@@ -26,7 +26,8 @@ RUN pip3 install -e 'git+https://github.com/datopian/ckanext-scheming.git@ckan-2
     pip3 install -r 'https://raw.githubusercontent.com/datopian/ckanext-scheming/ckan-2.10/test-requirements.txt' && \
     pip3 install -e 'git+https://github.com/datopian/ckanext-s3filestore.git@wri/cost-splitting-orgs#egg=ckanext-s3filestore' && \
     pip3 install -r 'https://raw.githubusercontent.com/datopian/ckanext-s3filestore/wri/cost-splitting-orgs/requirements.txt' && \
-    pip3 install -r 'https://raw.githubusercontent.com/datopian/ckanext-s3filestore/wri/cost-splitting-orgs/dev-requirements.txt'
+    pip3 install -r 'https://raw.githubusercontent.com/datopian/ckanext-s3filestore/wri/cost-splitting-orgs/dev-requirements.txt' && \
+    pip3 install -e 'git+https://github.com/datopian/ckanext-auth.git@v2.9#egg=ckanext-auth'
 
 # Update ckanext-s3filestore test.ini with minio credentials
 RUN sed -i "s|ckanext.s3filestore.aws_access_key_id = test-access-key|ckanext.s3filestore.aws_access_key_id = ${AWS_ACCESS_KEY_ID}|g" src/ckanext-s3filestore/test.ini && \
@@ -60,9 +61,20 @@ COPY setup/start_ckan_development.sh.override ${APP_DIR}/start_ckan_development.
 RUN chmod +x ${APP_DIR}/start_ckan_development.sh
 RUN chown ckan:ckan ${APP_DIR}/start_ckan_development.sh
 
-COPY setup/jwtRS256.key ${APP_DIR}/jwtRS256.key
-COPY setup/jwtRS256.key.pub ${APP_DIR}/jwtRS256.key.pub
-RUN chown ckan:ckan ${APP_DIR}/jwtRS256.key
-RUN chown ckan:ckan ${APP_DIR}/jwtRS256.key.pub
+#COPY setup/jwtRS256.key ${APP_DIR}/jwtRS256.key
+#COPY setup/jwtRS256.key.pub ${APP_DIR}/jwtRS256.key.pub
+#RUN chown ckan:ckan ${APP_DIR}/jwtRS256.key
+#RUN chown ckan:ckan ${APP_DIR}/jwtRS256.key.pub
+
+RUN apk --no-cache add openssl
+
+RUN openssl genpkey -algorithm RSA -out ${APP_DIR}/jwtRS256.key && \
+    openssl rsa -in ${APP_DIR}/jwtRS256.key -pubout -outform PEM -out ${APP_DIR}/jwtRS256.key.pub && \
+    chown ckan:ckan ${APP_DIR}/jwtRS256.key && \
+    chown ckan:ckan ${APP_DIR}/jwtRS256.key.pub
+
+#RUN ckan config-tool ${CKAN_INI} "api_token.jwt.algorithm = RS256" && \
+#    ckan config-tool ${CKAN_INI} "api_token.jwt.encode.secret = file:${APP_DIR}/jwtRS256.key" && \
+#    ckan config-tool ${CKAN_INI} "api_token.jwt.decode.secret = file:${APP_DIR}/jwtRS256.key.pub"
 
 CMD ["sh", "-c", "${APP_DIR}/start_ckan_development.sh"]
diff --git a/ckan-backend-dev/ckan/scripts/run_unit_tests.sh b/ckan-backend-dev/ckan/scripts/run_unit_tests.sh
@@ -1,20 +1,18 @@
 #!/bin/bash
 
-# Initialize a file to collect test outputs
-echo "CKAN and Extension Test Results" > test_results.txt
-echo "Test Summary" > test_summary.txt
+ROOT_DIR=$(pwd)
+
+echo "CKAN and Extension Test Results" > "$ROOT_DIR/test_results.txt"
+echo "Test Summary" > "$ROOT_DIR/test_summary.txt"
 
 # Run CKAN Core tests
-# Replace the command below with the one you use for CKAN core tests
 # pytest --ckan-ini=test-core.ini >> test_results.txt
 # if [ $? -eq 0 ]; then
 #     echo "CKAN Core: Passed" >> test_summary.txt
 # else
 #     echo "CKAN Core: Failed" >> test_summary.txt
 # fi
 
-# Loop through each extension directory to run tests
-
 cd src
 
 for dir in ckanext-*; do
@@ -26,18 +24,41 @@ for dir in ckanext-*; do
 
     cd $dir
 
-    pytest --ckan-ini=test.ini ckanext/${dir#ckanext-}/tests 2>&1 | tee -a ../test_results.txt
+    pytest --ckan-ini=test.ini ckanext/${dir#ckanext-}/tests 2>&1 | tee -a "$ROOT_DIR/test_results.txt"
+    PYTEST_EXIT_CODE=${PIPESTATUS[0]}
 
-    if [ $? -eq 0 ]; then
-      echo "$dir: Passed" >> ../test_summary.txt
+    if [ $PYTEST_EXIT_CODE -eq 0 ]; then
+      echo "$dir: Passed" >> "$ROOT_DIR/test_summary.txt"
     else
-      echo "$dir: Failed" >> ../test_summary.txt
+      echo "$dir: Failed" >> "$ROOT_DIR/test_summary.txt"
     fi
 
     cd ..
 
   fi
 done
 
-# Display summary
-cat test_summary.txt
+cd ..
+
+if [ -d "src_extensions/ckanext-wri" ]; then
+  cd src_extensions/ckanext-wri
+
+  pytest --ckan-ini=test.ini ckanext/wri/tests 2>&1 | tee -a "$ROOT_DIR/test_results.txt"
+  PYTEST_EXIT_CODE=${PIPESTATUS[0]}
+
+  if [ $PYTEST_EXIT_CODE -eq 0 ]; then
+    echo "ckanext-wri: Passed" >> "$ROOT_DIR/test_summary.txt"
+  else
+    echo "ckanext-wri: Failed" >> "$ROOT_DIR/test_summary.txt"
+  fi
+
+  cd ..
+
+fi
+
+cat "$ROOT_DIR/test_summary.txt"
+
+# GitHub Actions failure exit code
+if grep -q "Failed" "$ROOT_DIR/test_summary.txt"; then
+    exit 1
+fi
diff --git a/ckan-backend-dev/ckan/setup/jwtRS256.key b/ckan-backend-dev/ckan/setup/jwtRS256.key
diff --git a/ckan-backend-dev/ckan/setup/jwtRS256.key.pub b/ckan-backend-dev/ckan/setup/jwtRS256.key.pub
diff --git a/ckan-backend-dev/src/.gitkeep b/ckan-backend-dev/src/.gitkeep
diff --git a/ckan-backend-dev/src/ckanext-wri/.coveragerc b/ckan-backend-dev/src/ckanext-wri/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+omit =
+    */site-packages/*
+    */python?.?/*
+    ckan/*
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: "Test cost splitting" @@
     on:
       push:
         branches:
-          - dev
+          - staging
     defaults:
       run:
         shell: bash
@@ Expand Down @@