cleanup

google · Oct 12, 2023 · 7379cb6 · 7379cb6
1 parent 02aeb57
commit 7379cb6
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 109 deletions.
diff --git a/.github/workflows/amd64_cmake_glop_cpp.yml b/.github/workflows/amd64_cmake_glop_cpp.yml
@@ -2,7 +2,6 @@ name: amd64 CMake Glop C++
 
 on: [push, pull_request, workflow_dispatch]
 
-# Building using the github runner environement directly.
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -25,6 +24,7 @@ jobs:
     - name: Test Install
       run: make --directory=cmake glop_install_test
 
+  # ref: https://github.com/actions/runner-images
   linux:
     runs-on: ubuntu-latest
     steps:
@@ -38,6 +38,7 @@ jobs:
     - name: Install
       run: cmake --build build --config Release --target install -v -- DESTDIR=install
 
+  # ref: https://github.com/actions/runner-images
   macos:
     runs-on: macos-latest
     steps:
@@ -51,6 +52,7 @@ jobs:
     - name: Install
       run: cmake --build build --target install -v -- DESTDIR=install
 
+  # ref: https://github.com/actions/runner-images
   windows:
     runs-on: windows-latest
     steps:

diff --git a/.github/workflows/amd64_linux_bazel.yml b/.github/workflows/amd64_linux_bazel.yml
@@ -3,14 +3,20 @@ name: amd64 Linux Bazel
 
 on: [push, pull_request, workflow_dispatch]
 
+# Building using the github runner environement directly.
 jobs:
-  # Building using the github runner environement directly.
-  bazel:
-    runs-on: ubuntu-latest
+  linux:
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python: [
+          {version: '3.9'},
+          {version: '3.10'},
+          {version: '3.11'},
+          {version: '3.12'},
+        ]
       fail-fast: false
+    name: Linux • Bazel • Python-${{ matrix.python.version }}
+    runs-on: ubuntu-latest
     env:
       CC:  gcc-12
       CXX: g++-12
@@ -21,7 +27,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python.version }}
       - name: Check Python
         run: python --version
       - name: Install Bazel
@@ -38,10 +44,10 @@ jobs:
           bazel build
           -c opt
           --subcommands=pretty_print
-          ortools/... examples/...
+          //ortools/... //examples/...
       - name: Test
         run: >
           bazel test
           -c opt
           --test_output=errors
-          ortools/... examples/...
+          //ortools/... //examples/...
diff --git a/.github/workflows/amd64_linux_cmake_coinor_off.yml b/.github/workflows/amd64_linux_cmake_coinor_off.yml
@@ -1,101 +1,71 @@
+# ref: https://github.com/actions/runner-images
 name: amd64 Linux CMake CoinOR OFF
 
 on: [push, pull_request, workflow_dispatch]
 
+# Building using the github runner environement directly.
 jobs:
-  # Building using the github runner environement directly.
-  linux_cpp:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Check cmake
-      run: cmake --version
-    - name: Configure
-      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
-        -DBUILD_CXX=ON -DUSE_COINOR=OFF
-    - name: Build
-      run: cmake --build build --config Release --target all -v
-    - name: Test
-      run: CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target test -v
-    - name: Install
-      run: cmake --build build --config Release --target install -v -- DESTDIR=install
-
-  linux_dotnet:
+  linux:
+    strategy:
+      matrix:
+        cmake: [
+          {language: 'C++', args: '-DBUILD_CXX=ON'},
+          {language: '.Net', args: '-DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF -DBUILD_DOTNET=ON'},
+          {language: 'Java', args: '-DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF -DBUILD_JAVA=ON'},
+          {language: 'Python', args: '-DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF -DBUILD_PYTHON=ON'},
+        ]
+      fail-fast: false
+    name: Linux • CMake • ${{ matrix.cmake.language }} • No CoinOR
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      # Install SWIG
     - name: Swig install
       run: sudo apt install -y swig
     - name: Check swig
       run: swig -version
       # Install .NET SDKs
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
     - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.x
     - name: Check dotnet
       run: dotnet --info
-    - name: Check cmake
-      run: cmake --version
-    - name: Configure
-      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
-        -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
-        -DBUILD_DOTNET=ON -DUSE_COINOR=OFF
-    - name: Build
-      run: cmake --build build --config Release --target all -v
-    - name: Test
-      run: CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target test -v
-    - name: Install
-      run: cmake --build build --config Release --target install -v -- DESTDIR=install
-
-  linux_java:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Swig install
-      run: sudo apt install -y swig
-    - name: Check swig
-      run: swig -version
+      # Install Java
     - name: Check java
       run: java -version
-    - name: Check cmake
-      run: cmake --version
-    - name: Configure
-      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
-        -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
-        -DBUILD_JAVA=ON -DUSE_COINOR=OFF
-    - name: Build
-      run: cmake --build build --config Release --target all -v
-    - name: Test
-      run: CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target test -v
-    - name: Install
-      run: cmake --build build --config Release --target install -v -- DESTDIR=install
-
-  linux_python:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Swig install
-      run: sudo apt install -y swig
-    - name: Check swig
-      run: swig -version
+      # Install Python
     - name: Install python3 venv
       run: sudo apt-get install python3-venv
     - name: Update Path
       run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+      # CMake
     - name: Check cmake
       run: cmake --version
     - name: Configure
-      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
-        -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
-        -DBUILD_PYTHON=ON -DUSE_COINOR=OFF
+      run: >
+        cmake -S. -Bbuild
+        -DCMAKE_BUILD_TYPE=Release
+        -DBUILD_DEPS=ON
+        -DUSE_COINOR=OFF
+        ${{ matrix.cmake.args }}
     - name: Build
-      run: cmake --build build --config Release --target all -v
+      run: >
+        cmake --build build
+        --config Release
+        --target all
+        -v
     - name: Test
-      run: CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target test -v
+      run: >
+        CTEST_OUTPUT_ON_FAILURE=1
+        cmake --build build
+        --config Release
+        --target test
+        -v
     - name: Install
-      run: cmake --build build --config Release --target install -v -- DESTDIR=install
+      run: >
+        cmake --build build
+        --config Release
+        --target install
+        -v
+        -- DESTDIR=install
diff --git a/.github/workflows/amd64_linux_cmake_glpk_on.yml b/.github/workflows/amd64_linux_cmake_glpk_on.yml
@@ -1,21 +1,41 @@
+# ref: https://github.com/actions/runner-images
 name: amd64 Linux CMake GLPK ON
 
 on: [push, pull_request, workflow_dispatch]
 
+# Building using the github runner environement directly.
 jobs:
-  # Building using the github runner environement directly.
-  linux_cpp:
+  linux:
+    name: Linux • CMake • No GLPK
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Check cmake
-      run: cmake --version
-    - name: Configure
-      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
-        -DBUILD_CXX=ON -DUSE_GLPK=ON -DUSE_SCIP=OFF -DUSE_COINOR=OFF
-    - name: Build
-      run: cmake --build build --config Release --target all -v
-    - name: Test
-      run: CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target test -v
-    - name: Install
-      run: cmake --build build --config Release --target install -v -- DESTDIR=install
+      - uses: actions/checkout@v4
+      - name: Check cmake
+        run: cmake --version
+      - name: Configure
+        run: >
+          cmake -S. -Bbuild
+          -DCMAKE_BUILD_TYPE=Release
+          -DBUILD_DEPS=ON
+          -DBUILD_CXX=ON
+          -DUSE_GLPK=ON -DUSE_SCIP=OFF -DUSE_COINOR=OFF
+      - name: Build
+        run: >
+          cmake --build build
+          --config Release
+          --target all
+          -v
+      - name: Test
+        run: >
+          CTEST_OUTPUT_ON_FAILURE=1
+          cmake --build build
+          --config Release
+          --target test
+          -v
+      - name: Install
+        run: >
+          cmake --build build
+          --config Release
+          --target install
+          -v
+          -- DESTDIR=install
diff --git a/.github/workflows/amd64_linux_cmake_python.yml b/.github/workflows/amd64_linux_cmake_python.yml
@@ -14,13 +14,13 @@ jobs:
           {generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
         ]
         python: [
-          {version: 3.9},
-          {version: 3.10},
-          {version: 3.11},
-          {version: 3.12},
+          {version: '3.9'},
+          {version: '3.10'},
+          {version: '3.11'},
+          {version: '3.12'},
         ]
       fail-fast: false
-    name: ${{ matrix.cmake.generator }} Python ${{ matrix.python.version }}
+    name: ${{ matrix.cmake.generator }} • Python ${{ matrix.python.version }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/amd64_macos_bazel.yml b/.github/workflows/amd64_macos_bazel.yml
@@ -3,17 +3,22 @@ name: amd64 MacOS Bazel
 
 on: [push, pull_request, workflow_dispatch]
 
+# Building using the github runner environement directly.
 jobs:
-  # Building using the github runner environement directly.
-  bazel:
-    runs-on: macos-latest
+  macos:
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python: [
+          {version: '3.9'},
+          {version: '3.10'},
+          {version: '3.11'},
+          {version: '3.12'},
+        ]
       fail-fast: false
+    name: MacOS • Bazel • Python-${{ matrix.python.version }}
+    runs-on: macos-latest
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Set Java to OpenJDK 17 (Temurin)
         uses: actions/setup-java@v3
         with:
@@ -24,7 +29,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python.version }}
       - name: Check Python
         run: python --version
       - name: Install Bazel

diff --git a/.github/workflows/amd64_windows_bazel.yml b/.github/workflows/amd64_windows_bazel.yml
@@ -3,16 +3,21 @@ name: amd64 Windows Bazel
 
 on: [push, pull_request, workflow_dispatch]
 
+# Building using the github runner environement directly.
 jobs:
-  # Building using the github runner environement directly.
-  bazel:
+  windows:
     strategy:
       matrix:
         runner: [windows-2022, windows-2019]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python: [
+          {version: '3.9'},
+          {version: '3.10'},
+          {version: '3.11'},
+          {version: '3.12'},
+        ]
       fail-fast: false # Don't cancel all jobs if one fails.
+    name: ${{ matrix.runner }} • Bazel • Python-${{ matrix.python.version }}
     runs-on: ${{ matrix.runner }}
-    #runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
@@ -26,7 +31,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python.version }}
       - name: Check Python
         run: python --version
       - name: Install Bazel