Use a collection-agnostic checkout path in deploy workflows
2 changed files+19−15
.cofferdam/workflows/deploy.ymlmodified+9−7View file
@@ -26,14 +26,16 @@ jobs:
2626 build:
2727 runs-on: ubuntu-latest
2828 steps:
29- # Lay the two repos out as siblings matching local dev:
30- # <workspace>/concept-collection/numbl-figure-viewer (this app)
31- # <workspace>/numbl (numbl main)
29+ # Mirror the local dev layout, where the app sits one level below the
30+ # vault root alongside a checkout of numbl:
31+ # <workspace>/repos/numbl-figure-viewer (this app)
32+ # <workspace>/numbl (numbl main)
3233 # so the app's `"numbl": "file:../../numbl"` resolves to <workspace>/numbl.
34+ # Only the nesting depth matters here; the `repos/` name is arbitrary.
3335 - name: Checkout app
3436 uses: actions/checkout@v4
3537 with:
36- path: concept-collection/numbl-figure-viewer
38+ path: repos/numbl-figure-viewer
3739
3840 - name: Clone numbl (main)
3941 run: git clone --depth 1 --branch main https://github.com/flatironinstitute/numbl.git numbl
@@ -54,18 +56,18 @@ jobs:
5456 npm run build:graphics
5557
5658 - name: Install app dependencies
57- working-directory: concept-collection/numbl-figure-viewer
59+ working-directory: repos/numbl-figure-viewer
5860 run: npm install
5961
6062 - name: Build app
61- working-directory: concept-collection/numbl-figure-viewer
63+ working-directory: repos/numbl-figure-viewer
6264 run: npm run build:pages
6365
6466 - uses: actions/configure-pages@v5
6567
6668 - uses: actions/upload-pages-artifact@v3
6769 with:
68- path: concept-collection/numbl-figure-viewer/dist
70+ path: repos/numbl-figure-viewer/dist
6971
7072 deploy:
7173 needs: build
.github/workflows/deploy.ymlmodified+10−8View file
@@ -26,14 +26,16 @@ jobs:
2626 build:
2727 runs-on: ubuntu-latest
2828 steps:
29- # Lay the two repos out as siblings matching local dev:
30- # <workspace>/concept-collection/numbl-figure-viewer (this app)
31- # <workspace>/numbl (numbl main)
29+ # Mirror the local dev layout, where the app sits one level below the
30+ # vault root alongside a checkout of numbl:
31+ # <workspace>/repos/numbl-figure-viewer (this app)
32+ # <workspace>/numbl (numbl main)
3233 # so the app's `"numbl": "file:../../numbl"` resolves to <workspace>/numbl.
34+ # Only the nesting depth matters here; the `repos/` name is arbitrary.
3335 - name: Checkout app
3436 uses: actions/checkout@v4
3537 with:
36- path: concept-collection/numbl-figure-viewer
38+ path: repos/numbl-figure-viewer
3739
3840 - name: Checkout numbl (main)
3941 uses: actions/checkout@v4
@@ -48,7 +50,7 @@ jobs:
4850 cache: npm
4951 cache-dependency-path: |
5052 numbl/package-lock.json
51- concept-collection/numbl-figure-viewer/package-lock.json
53+ repos/numbl-figure-viewer/package-lock.json
5254
5355 # Build the numbl/graphics browser bundle the app imports. (HUSKY=0 skips
5456 # the git-hook setup in numbl's prepare script; numbl's own install script
@@ -62,18 +64,18 @@ jobs:
6264 npm run build:graphics
6365
6466 - name: Install app dependencies
65- working-directory: concept-collection/numbl-figure-viewer
67+ working-directory: repos/numbl-figure-viewer
6668 run: npm install
6769
6870 - name: Build app
69- working-directory: concept-collection/numbl-figure-viewer
71+ working-directory: repos/numbl-figure-viewer
7072 run: npm run build:pages
7173
7274 - uses: actions/configure-pages@v5
7375
7476 - uses: actions/upload-pages-artifact@v3
7577 with:
76- path: concept-collection/numbl-figure-viewer/dist
78+ path: repos/numbl-figure-viewer/dist
7779
7880 deploy:
7981 needs: build