Skip to content

Commit 4e48c70

Browse files
authored
Merge branch 'main' into jeff/build-cursor
2 parents e7b194d + b872a03 commit 4e48c70

3 files changed

Lines changed: 33 additions & 14 deletions

File tree

.github/workflows/agent-release-artifacts.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Agent Release Artifacts
22

33
on:
4-
release:
5-
types: [published]
64
# Allows you to run this workflow manually from the Actions tab
75
workflow_dispatch:
86

@@ -17,17 +15,13 @@ env:
1715
jobs:
1816
prepare:
1917
runs-on: ubuntu-latest
18+
# Only run for agents-v* tags
19+
if: startsWith(github.ref_name, 'agents-v')
2020
outputs:
21-
tag_date: ${{ steps.taggen.outputs.TAG_DATE }}
22-
tag_sha: ${{ steps.taggen.outputs.TAG_SHA }}
23-
steps:
24-
- name: generate tag data
25-
id: taggen
26-
run: |
27-
echo "TAG_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
28-
echo "TAG_SHA=$(echo '${{ github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
21+
tag_name: ${{ github.ref_name }}
2922
build:
3023
needs: prepare
24+
timeout-minutes: 30
3125
strategy:
3226
fail-fast: false
3327
matrix:
@@ -80,7 +74,7 @@ jobs:
8074
- name: upload binaries
8175
uses: actions/upload-artifact@v4
8276
with:
83-
name: ${{ matrix.TARGET }}-${{ needs.prepare.outputs.tag_sha }}-${{ needs.prepare.outputs.tag_date }}
77+
name: ${{ matrix.TARGET }}-${{ needs.prepare.outputs.tag_name }}
8478
path: |
8579
rust/main/target/${{ matrix.TARGET }}/release/relayer
8680
rust/main/target/${{ matrix.TARGET }}/release/relayer.exe

.github/workflows/rust-release.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ jobs:
100100
needs: check-release-status
101101
if: |
102102
github.event_name == 'push' &&
103-
needs.check-release-status.outputs.has_changes == 'true'
103+
needs.check-release-status.outputs.has_changes == 'true' &&
104+
needs.check-release-status.outputs.should_release == 'false'
104105
steps:
105106
- uses: actions/checkout@v5
106107
with:
@@ -355,7 +356,25 @@ jobs:
355356
$PRERELEASE_FLAG \
356357
--repo "${{ github.repository }}"
357358
359+
# Trigger dependent workflows
360+
# Note: We trigger explicitly because git push with GITHUB_TOKEN doesn't trigger workflows
361+
echo "Triggering agent-release-artifacts workflow for $TAG_NAME..."
362+
gh workflow run agent-release-artifacts.yml \
363+
--ref "$TAG_NAME" \
364+
--repo "${{ github.repository }}" || {
365+
echo "Warning: Failed to trigger agent-release-artifacts workflow."
366+
}
367+
368+
echo "Triggering rust-docker workflow for $TAG_NAME (including arm64)..."
369+
gh workflow run rust-docker.yml \
370+
--ref "$TAG_NAME" \
371+
--field include_arm64=true \
372+
--repo "${{ github.repository }}" || {
373+
echo "Warning: Failed to trigger rust-docker workflow."
374+
}
375+
358376
echo "$RELEASE_TYPE $TAG_NAME published successfully!" >> $GITHUB_STEP_SUMMARY
359377
[ "$IS_PRERELEASE" = "true" ] && echo "This is marked as a pre-release on GitHub." >> $GITHUB_STEP_SUMMARY
360378
echo "" >> $GITHUB_STEP_SUMMARY
361-
echo "Binary artifacts will be built automatically by the agent-release-artifacts workflow." >> $GITHUB_STEP_SUMMARY
379+
echo "Binary artifacts will be built by the agent-release-artifacts workflow." >> $GITHUB_STEP_SUMMARY
380+
echo "Docker images will be built by the rust-docker workflow." >> $GITHUB_STEP_SUMMARY

.github/workflows/test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ jobs:
268268
runs-on: depot-ubuntu-latest
269269
needs: [rust-only]
270270
if: needs.rust-only.outputs.only_rust == 'false'
271+
timeout-minutes: 20
271272
strategy:
272273
fail-fast: false
273274
matrix:
@@ -328,6 +329,7 @@ jobs:
328329
runs-on: depot-ubuntu-latest
329330
needs: [rust-only]
330331
if: needs.rust-only.outputs.only_rust == 'false'
332+
timeout-minutes: 10
331333
strategy:
332334
fail-fast: false
333335
matrix:
@@ -367,6 +369,7 @@ jobs:
367369
runs-on: depot-ubuntu-latest
368370
needs: [rust-only]
369371
if: needs.rust-only.outputs.only_rust == 'false'
372+
timeout-minutes: 10
370373
strategy:
371374
fail-fast: false
372375
matrix:
@@ -397,6 +400,7 @@ jobs:
397400
runs-on: depot-ubuntu-latest
398401
needs: [rust-only]
399402
if: needs.rust-only.outputs.only_rust == 'false'
403+
timeout-minutes: 20
400404
strategy:
401405
fail-fast: false
402406
matrix:
@@ -461,6 +465,7 @@ jobs:
461465
runs-on: depot-ubuntu-latest
462466
needs: [rust-only]
463467
if: needs.rust-only.outputs.only_rust == 'false'
468+
timeout-minutes: 10
464469
steps:
465470
- uses: actions/checkout@v5
466471
with:
@@ -518,7 +523,8 @@ jobs:
518523
519524
e2e-matrix:
520525
runs-on: depot-ubuntu-24.04-8
521-
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main' || github.base_ref == 'cli-2.0') || github.event_name == 'merge_group'
526+
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
527+
timeout-minutes: 30
522528
strategy:
523529
fail-fast: false
524530
matrix:

0 commit comments

Comments
 (0)