fix(docker): Correct workflow order

Signed-off-by: Helio Chissini de Castro <[email protected]>
oss-review-toolkit · Sep 7, 2023 · 912e03d · 912e03d
1 parent e5b8e6b
commit 912e03d
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 74 deletions.
diff --git a/.github/workflows/docker-ort-android.yml b/.github/workflows/docker-ort-android.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Docker Android Container
+name: Android Image
 
 on:
     workflow_dispatch:
     pull_request:
-        branches:
-            - main
-    push:
         paths:
             - '.ortversions/android.versions'
             - '.github/workflows/docker-ort-base.yml'
+    push:
+        branches:
+            - main
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -77,7 +77,7 @@ jobs:
                 with:
                     context: .
                     target: android
-                    push: true
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         ANDROID_CMD_VERSION=${{ env.ANDROID_CMD_VERSION }}

diff --git a/.github/workflows/docker-ort-base.yml b/.github/workflows/docker-ort-base.yml
@@ -15,17 +15,17 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Docker Base Container
+name: Base Image
 
 on:
     workflow_dispatch:
     pull_request:
-        branches:
-            - main
-    push:
         paths:
-            - 'Dockerfile'
             - '.ortversions/base.versions'
+            - 'Dockerfile'
+    push:
+        branches:
+            - main
 
 env:
     REGISTRY: ghcr.io
@@ -70,7 +70,7 @@ jobs:
                 with:
                     context: .
                     target: ort-base-image
-                    push: true
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             JAVA_VERSION=${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/docker-ort-binaries.yml b/.github/workflows/docker-ort-binaries.yml
@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Binaries Container
+name: Binary Image
 
 on:
     push:
@@ -26,7 +26,7 @@ on:
             - main
     workflow_dispatch:
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -71,7 +71,7 @@ jobs:
                 with:
                     context: .
                     target: ortbin
-                    push: true
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         ORT_VERSION=${{ env.ORT_VERSION }}

diff --git a/.github/workflows/docker-ort-dart.yml b/.github/workflows/docker-ort-dart.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Docker Dart Container
+name: Dart Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/dart.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -77,7 +77,7 @@ jobs:
                 with:
                     context: .
                     target: dart
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             DART_VERSION=${{ env.DART_VERSION }}

diff --git a/.github/workflows/docker-ort-dotnet.yml b/.github/workflows/docker-ort-dotnet.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Docker Dotnet Container
+name: Dotnet Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/dotnet.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
 
 env:
     REGISTRY: ghcr.io
@@ -74,7 +74,7 @@ jobs:
                 with:
                     context: .
                     target: dotnet
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         DOTNET_VERSION=${{ env.DOTNET_VERSION }}

diff --git a/.github/workflows/docker-ort-golang.yml b/.github/workflows/docker-ort-golang.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Golang Container
+name: Golang Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/golang.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -77,7 +77,7 @@ jobs:
                 with:
                     context: .
                     target: golang
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         GO_DEP_VERSION=${{ env.GO_DEP_VERSION }}

diff --git a/.github/workflows/docker-ort-haskell.yml b/.github/workflows/docker-ort-haskell.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Docker Haskell Container
+name: Haskell Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/haskell.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -77,7 +77,7 @@ jobs:
                 with:
                     context: .
                     target: haskell
-                    push: true
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             HASKELL_STACK_VERSION=${{ env.HASKELL_STACK_VERSION }}

diff --git a/.github/workflows/docker-ort-nodejs.yml b/.github/workflows/docker-ort-nodejs.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort NodeJS Container
+name: NodeJS Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/nodejs.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -76,7 +76,7 @@ jobs:
                 with:
                     context: .
                     target: nodejs
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         NODEJS_VERSION=${{ env.NODEJS_VERSION }}

diff --git a/.github/workflows/docker-ort-python.yml b/.github/workflows/docker-ort-python.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Python Container
+name: Python Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/python.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
         types:
             - completed
 
@@ -76,7 +76,7 @@ jobs:
                 with:
                     context: .
                     target: python
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             CONAN_VERSION=${{ env.CONAN_VERSION }}

diff --git a/.github/workflows/docker-ort-ruby.yml b/.github/workflows/docker-ort-ruby.yml
@@ -15,19 +15,20 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Ruby Container
+name: Ruby Image
 
 on:
-    workflow_run:
-        workflows: ["Ort Docker Base Image"]
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/ruby.versions'
             - '.github/workflows/docker-ort-base.yml'
+    workflow_run:
+        workflows: ["Base Image"]
+
 
 env:
     REGISTRY: ghcr.io
@@ -76,7 +77,7 @@ jobs:
                 with:
                     context: .
                     target: ruby
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             RUBY_VERSION=${{ env.RUBY_VERSION }}

diff --git a/.github/workflows/docker-ort-runtime.yml b/.github/workflows/docker-ort-runtime.yml
@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Runtime Container
+name: Runtime Image
 
 on:
     workflow_dispatch:
@@ -27,12 +27,12 @@ on:
             - main
     workflow_run:
         workflows:
-            - 'Ort Binaries Container'
-            - 'Ort Python Container'
-            - 'Ort NodeJS Container'
-            - 'Ort Ruby Container'
-            - 'Ort Rust Container'
-            - 'Ort Golang Container'
+            - 'Binary Image'
+            - 'Python Image'
+            - 'NodeJS Image'
+            - 'Ruby Image'
+            - 'Rust Image'
+            - 'Golang Image'
         types:
             - completed
 
@@ -81,7 +81,7 @@ jobs:
                 with:
                     context: .
                     target: run
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                         NODEJS_VERSION=${{ env.NODEJS_VERSION }}

diff --git a/.github/workflows/docker-ort-rust.yml b/.github/workflows/docker-ort-rust.yml
@@ -15,19 +15,19 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Ort Rust Container
+name: Rust Image
 
 on:
     workflow_dispatch:
-    pull_request:
+    push:
         branches:
             - main
-    push:
+    pull_request:
         paths:
             - '.ortversions/rust.versions'
             - '.github/workflows/docker-ort-base.yml'
     workflow_run:
-        workflows: ["Ort Docker Base Image"]
+        workflows: ["Base Image"]
 
 env:
     REGISTRY: ghcr.io
@@ -75,7 +75,7 @@ jobs:
                 with:
                     context: .
                     target: rust
-                    push: ${{ github.event_name == 'push' }}
+                    push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
                     load: false
                     build-args: |
                             RUST_VERSION=${{ env.RUST_VERSION }}