Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes grist-oss experiemental accidentally including grist-ee code #1091

Merged
merged 1 commit into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,6 @@ xunit.xml
.clipboard.lock

**/_build

# ext directory can be overwritten
ext/**
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
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).