Merge pull request #6931 from drew2a/fix/ga_change_order

GitHub Actions: Change order of upload value
Tribler · Jun 9, 2022 · d9c44f2 · d9c44f2
2 parents 2c36e94 + d082c6c
commit d9c44f2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -3,29 +3,23 @@ name: Ubuntu
 on:
   workflow_call:
     inputs:
-      upload:
-        default: false
-        type: boolean
-        required: true
-
       os:
         default: ubuntu-latest
         type: string
-        required: true
+        required: false
 
       python-version:
         default: 3.8
         type: string
         required: false
 
-  workflow_dispatch:
-    inputs:
       upload:
-        description: Upload
-        default: true
+        default: false
         type: boolean
-        required: true
+        required: false
 
+  workflow_dispatch:
+    inputs:
       os:
         description: Environment
         default: ubuntu-latest
@@ -38,6 +32,12 @@ on:
         type: string
         required: true
 
+      upload:
+        description: Upload
+        default: true
+        type: boolean
+        required: true
+
 jobs:
   build:
     runs-on: ${{ github.event.inputs.os || inputs.os }}

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -3,11 +3,6 @@ name: Windows
 on:
   workflow_call:
     inputs:
-      upload:
-        default: false
-        type: boolean
-        required: false
-
       os:
         default: windows-latest
         type: string
@@ -18,14 +13,13 @@ on:
         type: string
         required: false
 
-  workflow_dispatch:
-    inputs:
       upload:
-        description: Upload
-        default: true
+        default: false
         type: boolean
-        required: true
+        required: false
 
+  workflow_dispatch:
+    inputs:
       os:
         description: Environment
         default: windows-latest
@@ -37,6 +31,13 @@ on:
         default: '3.8'
         type: string
         required: true
+
+      upload:
+        description: Upload
+        default: true
+        type: boolean
+        required: true
+
 jobs:
   build:
     runs-on: ${{ github.event.inputs.os || inputs.os }}