Skip to content

Commit 7535d8f

Browse files
committed
ci: clone zen sibling deps and moxcms during build
Replace single ../zensim clone with full ../zen/* tree needed by Cargo [patch.crates-io] and path deps on the imageflow-3-rebased branch. Repos cloned into ../zen/: zensim, zenpixels, zencodec, zenjpeg, zenlayout, zenpipe, zencodecs, zennode, zenresize, zenfilters, linear-srgb Also clones ../moxcms (lilith/moxcms fork, non-optional dep). Updates CROSS_CONTAINER_OPTS to mount ../zen and ../moxcms instead of the old ../zensim path.
1 parent 16fc9e4 commit 7535d8f

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,22 @@ jobs:
143143
- name: Checkout code
144144
uses: actions/checkout@v6
145145

146-
- name: Checkout zensim (sibling dependency)
147-
run: git clone --depth 1 https://github.com/imazen/zensim.git ../zensim
146+
- name: Checkout zen sibling dependencies
147+
shell: bash
148+
run: |
149+
mkdir -p ../zen
150+
git clone --depth 1 https://github.com/imazen/zensim.git ../zen/zensim
151+
git clone --depth 1 https://github.com/imazen/zenpixels.git ../zen/zenpixels
152+
git clone --depth 1 https://github.com/imazen/zencodec.git ../zen/zencodec
153+
git clone --depth 1 https://github.com/imazen/zenjpeg.git ../zen/zenjpeg
154+
git clone --depth 1 https://github.com/imazen/zenlayout.git ../zen/zenlayout
155+
git clone --depth 1 https://github.com/imazen/zenpipe.git ../zen/zenpipe
156+
git clone --depth 1 https://github.com/imazen/zencodecs.git ../zen/zencodecs
157+
git clone --depth 1 https://github.com/imazen/zennode.git ../zen/zennode
158+
git clone --depth 1 https://github.com/imazen/zenresize.git ../zen/zenresize
159+
git clone --depth 1 https://github.com/imazen/zenfilters.git ../zen/zenfilters
160+
git clone --depth 1 https://github.com/imazen/linear-srgb.git ../zen/linear-srgb
161+
git clone --depth 1 https://github.com/lilith/moxcms.git ../moxcms
148162
149163
- name: Parse version
150164
uses: ./.github/actions/parse-version
@@ -283,7 +297,7 @@ jobs:
283297
cargo nextest run --target ${{ matrix.target }} ${{ env.CROSS_ARGS }} --profile ci
284298
fi
285299
env:
286-
CROSS_CONTAINER_OPTS: "--volume ${{ github.workspace }}/../zensim:${{ github.workspace }}/../zensim"
300+
CROSS_CONTAINER_OPTS: "--volume ${{ github.workspace }}/../zen:${{ github.workspace }}/../zen --volume ${{ github.workspace }}/../moxcms:${{ github.workspace }}/../moxcms"
287301
REGRESS_MANIFEST_DIR: ${{ github.workspace }}/.image-cache/manifests
288302
if: matrix.cross == 'true'
289303

@@ -353,7 +367,7 @@ jobs:
353367
args: "--all ${{ env.BUILD_EXCLUDE }} ${{ env.CROSS_ARGS }}"
354368
force-use-cross: ${{ matrix.force-cross == 'true' || false }}
355369
env:
356-
CROSS_CONTAINER_OPTS: "--volume ${{ github.workspace }}/../zensim:${{ github.workspace }}/../zensim"
370+
CROSS_CONTAINER_OPTS: "--volume ${{ github.workspace }}/../zen:${{ github.workspace }}/../zen --volume ${{ github.workspace }}/../moxcms:${{ github.workspace }}/../moxcms"
357371
if: matrix.cross == 'true'
358372

359373

0 commit comments

Comments
 (0)