From aa5a59741aefe816a4233de3eb251de2ee5b09f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxemilian=20Gr=C3=B6nblom?= <maxemiliang@gmail.com>
Date: Sat, 6 Apr 2024 22:46:18 +0300
Subject: [PATCH] feat: Re enable licensed build workflow

---
 .github/workflows/benchmarker.yml |  2 +-
 .github/workflows/build-push.yml  | 66 +++++++++++++++----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/benchmarker.yml b/.github/workflows/benchmarker.yml
index 49a77a40..f2cee1b4 100644
--- a/.github/workflows/benchmarker.yml
+++ b/.github/workflows/benchmarker.yml
@@ -124,7 +124,7 @@ jobs:
           OS_IDENTITY_API_VERSION: "3"
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         working-directory: ${{ github.workspace }}/shot-benchmarker
-        run: python main.py -c -s
+        run: python main.py -c -s --runs 5
 
       - name: Upload benchmarks
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 3afb30be..da166acb 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -18,26 +18,26 @@ jobs:
       upload_artifacts: true
 
   # Then, we build and test using all licenses included proprietary ones
-#  build-proprietary:
-#    name: Build & Test (Proprietary licenses)
-#    needs: [ build-test ]
-#    uses: ./.github/workflows/build-workflow.yml
-#    with:
-#      job_count: 4
-#      build_type: Release
-#      retention: 30
-#      upload_artifacts: false
-#      enable_gurobi: true
-#      enable_gams: true
-#      artifact_suffix: '-proprietary'
-#    secrets:
-#      gurobi_license: ${{ secrets.GUROBI_LICENSE_FILE }}
-#      gams_license: ${{ secrets.GAMS_LICENSE_FILE }}
+  build-proprietary:
+    name: Build & Test (Proprietary licenses)
+    needs: [ build-test ]
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      job_count: 4
+      build_type: Release
+      retention: 30
+      upload_artifacts: false
+      enable_gurobi: true
+      enable_gams: true
+      artifact_suffix: '-proprietary'
+    secrets:
+      gurobi_license: ${{ secrets.GUROBI_LICENSE_FILE }}
+      gams_license: ${{ secrets.GAMS_LICENSE_FILE }}
 
   # Finally, we run some simple benchmarks
   benchmark:
     name: Benchmark
-    needs: [ build-test ]
+    needs: [ build-test, build-proprietary ]
     uses: ./.github/workflows/benchmarker.yml
     with:
       benchmark_folder: "MINLP-convex-small"
@@ -51,21 +51,21 @@ jobs:
       OS_USERNAME: ${{ secrets.OS_USERNAME }}
       OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
 
-  # Publish the test results as an output
-#  publish-test:
-#    name: Publish test results
-#    needs: [ build-test ]
-#    runs-on: [ self-hosted, docker ]
-#    steps:
-#      - uses: actions/download-artifact@v3
-#        name: Download artifacts
-#        with:
-#          path: artifacts
-#
-#      - name: Publish Test Results
-#        uses: EnricoMi/publish-unit-test-result-action@v2
-#        if: always()
-#        with:
-#          files: |
-#            artifacts/test-*/*.xml
+   # Publish the test results as an output
+  publish-test:
+    name: Publish test results
+    needs: [ build-test, build-proprietary, benchmark ]
+    runs-on: [ self-hosted, docker ]
+    steps:
+      - uses: actions/download-artifact@v3
+        name: Download artifacts
+        with:
+          path: artifacts
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: |
+            artifacts/test-*/*.xml