Skip to content

Commit

Permalink
Merge branch 'UCSFCLE_404_STABLE' into T-1582/UCSFLCE_404/add-availab…
Browse files Browse the repository at this point in the history
…ility_mobileapp
  • Loading branch information
lbailey-ucsf authored Nov 13, 2024
2 parents 3c2a6c1 + 7d5df47 commit 0d933a9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
description: Additional options to apply to PHPUnit
required: false
default: ''
pull_request:

env:
php: 8.3
Expand All @@ -27,7 +28,6 @@ jobs:
# Do not run Grunt on submodules for now, until we are ready to fix these submodules
# with:
# submodules: true
# token: ${{ secrets.GH_PAT }}

- name: Configuring node & npm
uses: actions/setup-node@v4
Expand Down Expand Up @@ -113,7 +113,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
token: ${{ secrets.GH_PAT }}

- name: Setting up PHPUnit
env:
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
path = admin/tool/ilioscategoryassignment
url = https://github.com/ilios/tool_ilioscategoryassignment.git
branch = MOODLE_404_STABLE
[submodule "admin/tool/ldapsync"]
path = admin/tool/ldapsync
url = https://github.com/ucsf-education/moodle-admin-tool-ldapsync
branch = MOODLE_404_STABLE
[submodule "availability/condition/mobileapp"]
path = availability/condition/mobileapp
url = https://github.com/ucsf-education/moodle-availability_mobileapp
Expand All @@ -27,6 +31,11 @@
path = blocks/quickmail
url = https://github.com/ucsf-education/moodle-block_quickmail
branch = UCSFCLE_404_STABLE
[submodule "blocks/massaction"]
path = blocks/massaction
url = https://github.com/Syxton/moodle-block_massaction
branch = master
tag = 7.3.1
[submodule "course/format/topcoll"]
path = course/format/topcoll
url = https://github.com/gjbarnard/moodle-format_topcoll
Expand Down
1 change: 1 addition & 0 deletions admin/tool/ldapsync
Submodule ldapsync added at 2b3bfd
1 change: 1 addition & 0 deletions blocks/massaction
Submodule massaction added at 387c14

0 comments on commit 0d933a9

Please sign in to comment.