From ed3d84e9eaa7a75f08124d09ee856a3cfa205128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxemilian=20Gr=C3=B6nblom?= <maxemiliang@gmail.com>
Date: Sat, 20 Apr 2024 14:16:46 +0300
Subject: [PATCH] fix: always run benchmarks after build + some inputs to the
 benchmarker and secrets.

---
 .github/workflows/build-push.yml     |  6 ++++++
 .github/workflows/build-workflow.yml | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 937b13f1..395ffc5c 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -16,6 +16,10 @@ jobs:
       build_type: Release
       retention: 30
       upload_artifacts: true
+      run_benchmarks: true
+    secrets:
+      OS_USERNAME: ${{ secrets.OS_USERNAME }}
+      OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
 
   # Then, we build and test using all licenses included proprietary ones
   build-proprietary:
@@ -33,6 +37,8 @@ jobs:
     secrets:
       gurobi_license: ${{ secrets.GUROBI_LICENSE_FILE }}
       gams_license: ${{ secrets.GAMS_LICENSE_FILE }}
+      OS_USERNAME: ${{ secrets.OS_USERNAME }}
+      OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
 
 
   # Publish the test results as an output
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index 46cd72c5..d4437871 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -59,6 +59,11 @@ on:
         default: '42.3.0'
         required: false
         type: string
+      run_benchmarks:
+        description: 'Should the benchmarks be run'
+        default: false
+        required: false
+        type: boolean
     secrets:
       gurobi_license:
         description: 'Gurobi license file secret'
@@ -66,6 +71,12 @@ on:
       gams_license:
         description: 'GAMS license file secret'
         required: false
+      OS_USERNAME:
+        description: 'OpenStack username'
+        required: false
+      OS_PASSWORD:
+        description: 'OpenStack password'
+        required: false
 
     outputs:
       test-artifact:
@@ -350,8 +361,10 @@ jobs:
 
   # Finally, we run some simple benchmarks
   benchmark:
+    if: ${{ inputs.run_benchmarks }}
     name: Benchmark
     uses: ./.github/workflows/benchmarker.yml
+    needs: [ build ]
     with:
       shot_executable_path: "${{ github.workspace }}/build"
       benchmark_folder: "MINLP-convex-small"