Skip to content

Commit

Permalink
Fixes OSS including EE by providing empty ext dir
Browse files Browse the repository at this point in the history
  • Loading branch information
Spoffy committed Jul 8, 2024
1 parent d41aeb5 commit 1508e4e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
load: true
tags: ${{ env.DOCKER_HUB_OWNER }}/${{ matrix.image.name }}:${{ env.TAG }}
cache-from: type=gha
build-contexts: ${{ matrix.image.name != 'grist-oss' && 'ext=ext' || '' }}
build-contexts: ext=ext

- name: Use Node.js ${{ matrix.node-version }} for testing
if: ${{ !inputs.disable_tests }}
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
tags: ${{ env.DOCKER_HUB_OWNER }}/${{ matrix.image.name }}:${{ env.TAG }}
cache-from: type=gha
cache-to: type=gha,mode=max
build-contexts: ${{ matrix.image.name != 'grist-oss' && 'ext=ext' || '' }}
build-contexts: ext=ext

- name: Push Enterprise to Docker Hub
if: ${{ matrix.image.name == 'grist' }}
Expand Down
1 change: 1 addition & 0 deletions buildtools/checkout-ext-directory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ pushd $repo
git sparse-checkout set ext
git checkout
popd
rm -rf ./ext
mv $repo/ext .
rm -rf $repo
4 changes: 4 additions & 0 deletions ext/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**/*

!.gitignore
!README.md
5 changes: 5 additions & 0 deletions ext/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
`ext` is a directory that allows derivatives of Grist core to be created, without modifying any of the base files.

Files placed in here should be new files, or replacing files in the `stubs` directory.

When compiling, Typescript resolves files in `ext` before files in `stubs`, using the `ext` file instead (if it exists).

0 comments on commit 1508e4e

Please sign in to comment.