Merge remote-tracking branch 'origin/develop' into simplified-layernorm

ROCm · May 30, 2024 · 7dca5b4 · 7dca5b4
2 parents 0b7f671 + b9cce08
commit 7dca5b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/rocm-image-release.yaml b/.github/workflows/rocm-image-release.yaml
@@ -18,6 +18,10 @@ on:
         description: Docker image name for rocm Docker build
         required: true
         default: "rocm-migraphx"
+      branch_name:
+        description: branch to use for building base ROCm image
+        required: true
+        default: "develop"
       build_navi:
         description: Build navi number
         required: true
@@ -35,6 +39,7 @@ jobs:
       benchmark-utils_repo: ${{ github.event.inputs.benchmark-utils_repo || 'ROCm/migraphx-benchmark-utils' }}
       base_image: ${{ github.event.inputs.base_image || 'rocm/dev-ubuntu-20.04' }}
       docker_image: ${{ github.event.inputs.docker_image || 'rocm-migraphx' }}
+      branch_name: ${{ github.event.inputs.branch_name || 'develop' }}
       build_navi: ${{ github.event.inputs.build_navi || '0' }}
       overwrite: ${{ github.event.inputs.overwrite == 'true' }}
     secrets:

diff --git a/.github/workflows/sync_rocMLIR.yaml b/.github/workflows/sync_rocMLIR.yaml
@@ -4,7 +4,7 @@ on:
   schedule:
     - cron: '0 7 * * sun'
   pull_request:
-    branches: [develop]
+    branches: [rocMLIR-sync-*]
     types: [synchronize, closed]
   workflow_dispatch:
     inputs: