Skip to content

Commit

Permalink
Merge branch 'modularization-main' into feature/sc-26885/redefine-add…
Browse files Browse the repository at this point in the history
…-to-sheet-experience
  • Loading branch information
stevekaplan123 committed Oct 15, 2024
2 parents ef5752b + 7019aff commit 91101ea
Show file tree
Hide file tree
Showing 65 changed files with 1,915 additions and 1,123 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: https://donate.sefaria.org/en # Replace with a single custom sponsorship URL
custom: https://donate.sefaria.org/give/451346/#!/donation/checkout?c_src=github # Replace with a single custom sponsorship URL
33 changes: 30 additions & 3 deletions .github/workflows/continuous.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Continuous
on:
pull_request:
types:
- opened
- reopened
- synchronize
- ready_for_review
merge_group:
push:
branches:
Expand Down Expand Up @@ -178,9 +183,9 @@ jobs:
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ build-derived ]
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
needs: build-derived
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -251,9 +256,8 @@ jobs:
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ sandbox-ready ]
if: github.event.pull_request.draft == false
needs:
- sandbox-ready
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -371,3 +375,26 @@ jobs:
- name: Uninstall
run: helm delete sandbox-${{ steps.get-sha.outputs.sha_short }} -n ${{ secrets.DEV_SANDBOX_NAMESPACE }} --debug --timeout 10m0s
if: steps.get-helm.outputs.count > 0
continuous-branch-protection:
needs: [ build-generic, build-derived, sandbox-deploy, sandbox-ready, pytest-job ]
runs-on: ubuntu-latest
if: always()
steps:
- name:
run: |
if [ "${{ github.event_name }}" == "merge_group" ]; then
exit 0
fi
if [ "${{ needs.build-generic.result }}" != "success" ] || \
[ "${{ needs.build-derived.result }}" != "success" ]; then
echo "One or more build jobs failed"
exit 1
fi
if [ "${{ github.event.pull_request.draft }}" == "false" ]; then
if [ "${{ needs.sandbox-deploy.result }}" != "success" ] || \
[ "${{ needs.sandbox-ready.result }}" != "success" ] || \
[ "${{ needs.pytest-job.result }}" != "success" ]; then
echo "One or more test jobs failed"
exit 1
fi
fi
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id: semantic
with:
extra_plugins: |
conventional-changelog-conventionalcommits@6.1.0
conventional-changelog-conventionalcommits@8.0.0
@semantic-release/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 0 additions & 1 deletion build/ci/integration-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ localSettings:
DEBUG: true
DOMAIN_LANGUAGE: {}
APSCHEDULER_NAME: "apscheduler-{{ .Values.deployEnv }}"
TURN_SERVER: ''
USE_CLOUDFLARE: false
FRONT_END_URL: "http://${NAME}.integration.sefaria.org"
OFFLINE: false
Expand Down
1 change: 0 additions & 1 deletion build/ci/production-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ localSettings:
}
MONGO_HOST: "mongo"
APSCHEDULER_NAME: "apscheduler-{{ .Values.deployEnv }}"
TURN_SERVER: ''
USE_CLOUDFLARE: false
FRONT_END_URL: "http://www.sefaria.org"
OFFLINE: false
Expand Down
1 change: 0 additions & 1 deletion build/ci/sandbox-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ localSettings:
DEBUG: false
DOMAIN_LANGUAGE: {}
APSCHEDULER_NAME: "apscheduler-{{ .Values.deployEnv }}"
TURN_SERVER: ''
USE_CLOUDFLARE: false
FRONT_END_URL: "http://${NAME}.cauldron.sefaria.org"
OFFLINE: false
Expand Down
2 changes: 1 addition & 1 deletion build/notify/notifyEnd.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ console.log(`

const jobKeys = [
"Jest",
"PyTest",
"Continuous Testing: PyTest",
"Playwright",
];

Expand Down
Loading

0 comments on commit 91101ea

Please sign in to comment.