Skip to content

Commit 0669659

Browse files
committed
ci: Publish maxtext upstream & rosetta images
1 parent d0ecc69 commit 0669659

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/_ci.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,22 @@ jobs:
201201
{"flavor": "jax", "stage": "final", "priority": 1000, "tag": "${{ needs.build-jax.outputs.DOCKER_TAG_FINAL }}"},\
202202
{"flavor": "triton", "stage": "final", "priority": 900, "tag": "${{ needs.build-triton.outputs.DOCKER_TAG_FINAL }}"},\
203203
{"flavor": "equinox", "stage": "final", "priority": 900, "tag": "${{ needs.build-equinox.outputs.DOCKER_TAG_FINAL }}"},\
204-
{"flavor": "maxtext", "stage": "final", "priority": 900, "tag": "${{ needs.build-upstream-maxtext.outputs.DOCKER_TAG_FINAL }}"},\
204+
{"flavor": "upstream-maxtext", "stage": "final", "priority": 900, "tag": "${{ needs.build-upstream-maxtext.outputs.DOCKER_TAG_FINAL }}"},\
205205
{"flavor": "levanter", "stage": "final", "priority": 900, "tag": "${{ needs.build-levanter.outputs.DOCKER_TAG_FINAL }}"},\
206206
{"flavor": "upstream-t5x", "stage": "final", "priority": 900, "tag": "${{ needs.build-upstream-t5x.outputs.DOCKER_TAG_FINAL }}"},\
207207
{"flavor": "upstream-pax", "stage": "final", "priority": 900, "tag": "${{ needs.build-upstream-pax.outputs.DOCKER_TAG_FINAL }}"},\
208+
{"flavor": "maxtext", "stage": "final", "priority": 900, "tag": "${{ needs.build-rosetta-maxtext.outputs.DOCKER_TAG_FINAL }}"},\
208209
{"flavor": "t5x", "stage": "final", "priority": 900, "tag": "${{ needs.build-rosetta-t5x.outputs.DOCKER_TAG_FINAL }}"},\
209210
{"flavor": "pax", "stage": "final", "priority": 900, "tag": "${{ needs.build-rosetta-pax.outputs.DOCKER_TAG_FINAL }}"},\
210211
{"flavor": "grok", "stage": "final", "priority": 900, "tag": "${{ needs.build-grok.outputs.DOCKER_TAG_FINAL }}"},\
211212
{"flavor": "jax", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-jax.outputs.DOCKER_TAG_MEALKIT }}"},\
212213
{"flavor": "triton", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-triton.outputs.DOCKER_TAG_MEALKIT }}"},\
213214
{"flavor": "equinox", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-equinox.outputs.DOCKER_TAG_MEALKIT }}"},\
214-
{"flavor": "maxtext", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-upstream-maxtext.outputs.DOCKER_TAG_MEALKIT }}"},\
215+
{"flavor": "upstream-maxtext", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-upstream-maxtext.outputs.DOCKER_TAG_MEALKIT }}"},\
215216
{"flavor": "levanter", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-levanter.outputs.DOCKER_TAG_MEALKIT }}"},\
216217
{"flavor": "upstream-t5x", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-upstream-t5x.outputs.DOCKER_TAG_MEALKIT }}"},\
217218
{"flavor": "upstream-pax", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-upstream-pax.outputs.DOCKER_TAG_MEALKIT }}"},\
219+
{"flavor": "maxtext", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-rosetta-maxtext.outputs.DOCKER_TAG_MEALKIT }}"},\
218220
{"flavor": "t5x", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-rosetta-t5x.outputs.DOCKER_TAG_MEALKIT }}"},\
219221
{"flavor": "pax", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-rosetta-pax.outputs.DOCKER_TAG_MEALKIT }}"},\
220222
{"flavor": "grok", "stage": "mealkit", "priority": 500, "tag": "${{ needs.build-grok.outputs.DOCKER_TAG_MEALKIT }}"},\

.github/workflows/ci.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: CI
22

33
on:
44
schedule:
5-
- cron: '30 9 * * *' # Pacific Time 01:30 AM in UTC
5+
- cron: "30 9 * * *" # Pacific Time 01:30 AM in UTC
66
pull_request:
77
types:
88
- opened
99
- reopened
1010
- ready_for_review
1111
- synchronize
1212
paths-ignore:
13-
- '**.md'
13+
- "**.md"
1414
workflow_dispatch:
1515
inputs:
1616
PUBLISH:
@@ -34,16 +34,15 @@ concurrency:
3434
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3535

3636
permissions:
37-
contents: write # to fetch code and push branch
38-
actions: write # to cancel previous workflows
39-
packages: write # to upload container
40-
pull-requests: write # to make pull request for manifest bump
37+
contents: write # to fetch code and push branch
38+
actions: write # to cancel previous workflows
39+
packages: write # to upload container
40+
pull-requests: write # to make pull request for manifest bump
4141

4242
env:
4343
DEFAULT_MANIFEST_ARTIFACT_NAME: bumped-manifest
4444

4545
jobs:
46-
4746
metadata:
4847
runs-on: ubuntu-22.04
4948
outputs:
@@ -115,7 +114,7 @@ jobs:
115114
shell: bash -x -e {0}
116115
run: |
117116
bash bump.sh --input-manifest manifest.yaml --output-manifest manifest.yaml.new --base-patch-dir ./patches-new
118-
117+
119118
- name: Maybe replace current manifest/patches with the new one and show diff
120119
working-directory: .github/container
121120
shell: bash -x -e {0}
@@ -168,12 +167,11 @@ jobs:
168167
steps:
169168
- name: "Tests Succeeded: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}"
170169
id: test_result
171-
run:
172-
echo "SUCCEEDED=${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}" | tee -a $GITHUB_OUTPUT
170+
run: echo "SUCCEEDED=${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}" | tee -a $GITHUB_OUTPUT
173171

174172
- name: Check out the repository under ${GITHUB_WORKSPACE}
175173
uses: actions/checkout@v4
176-
174+
177175
- name: Delete checked-out manifest and patches
178176
run: |
179177
rm .github/container/manifest.yaml
@@ -213,7 +211,7 @@ jobs:
213211
git merge --ff-only ${{ needs.metadata.outputs.MANIFEST_BRANCH }}
214212
# Push the new change
215213
git push origin ${{ github.ref_name }}
216-
214+
217215
# We will create a Draft PR & remote branch if:
218216
# 1. The tests failed
219217
# 2. The merge failed
@@ -244,12 +242,12 @@ jobs:
244242
draft: true
245243
env:
246244
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
247-
245+
248246
- name: "Log created PR: #${{ fromJson(steps.create_pr.outputs.data).number }}"
249247
if: steps.create_pr.outcome == 'success'
250248
run: |
251249
echo "https://github.com/NVIDIA/JAX-Toolbox/pull/${{ fromJson(steps.create_pr.outputs.data).number }}" | tee -a $GITHUB_STEP_SUMMARY
252-
250+
253251
# Guard delete in simple check to protect other branches
254252
- name: Check that the branch matches znightly- prefix
255253
run: |
@@ -271,7 +269,7 @@ jobs:
271269

272270
make-publish-configs:
273271
runs-on: ubuntu-22.04
274-
if: ${{ !cancelled() }}
272+
if: ${{ !cancelled() }}
275273
env:
276274
MEALKIT_IMAGE_REPO: ${{ needs.metadata.outputs.PUBLISH == 'true' && 'jax-mealkit' || 'mock-jax-mealkit' }}
277275
FINAL_IMAGE_REPO: ${{ needs.metadata.outputs.PUBLISH == 'true' && 'jax' || 'mock-jax' }}
@@ -294,6 +292,7 @@ jobs:
294292
levanter
295293
upstream-t5x
296294
upstream-pax
295+
upstream-maxtext
297296
t5x
298297
pax
299298
grok
@@ -365,7 +364,7 @@ jobs:
365364
needs:
366365
- metadata
367366
- make-publish-configs
368-
if: ${{ !cancelled() && needs.make-publish-configs.outputs.PUBLISH_CONFIGS.config != '{"config":[]}' }}
367+
if: ${{ !cancelled() && needs.make-publish-configs.outputs.PUBLISH_CONFIGS.config != '{"config":[]}' }}
369368
strategy:
370369
fail-fast: false
371370
matrix: ${{ fromJson(needs.make-publish-configs.outputs.PUBLISH_CONFIGS) }}

0 commit comments

Comments
 (0)