WIP

hpcc-systems · Nov 9, 2023 · 2eafa3c · 2eafa3c
1 parent fbbfc5d
commit 2eafa3c
Showing 1 changed file with 109 additions and 173 deletions.
diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -70,176 +70,112 @@ jobs:
       asset-name: 'docker-package'
     secrets: inherit
 
-  build-docker-ubuntu-23_10:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: ubuntu-23.10
-      single-package: true
-      containerized: false
-    secrets: inherit
-
-  build-docker-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: ubuntu-22.04
-      single-package: true
-      containerized: false
-      upload-package: true
-      asset-name: 'docker-package'
-    secrets: inherit
-
-  test-smoke-docker-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-docker-ubuntu-22_04
-    uses: ./.github/workflows/test-smoke-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'docker-package'
-    secrets: inherit
-
-  test-unit-docker-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-docker-ubuntu-22_04
-    uses: ./.github/workflows/test-unit-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'docker-package'
-    secrets: inherit
-
-  test-ui-docker-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-docker-ubuntu-22_04
-    uses: ./.github/workflows/test-ui-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'docker-package'
-    secrets: inherit
-
-  build-docker-ubuntu-20_04:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: ubuntu-20.04
-      single-package: true
-      containerized: false
-    secrets: inherit
-
-  build-docker-centos-8:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: centos-8
-      single-package: true
-      containerized: false
-    secrets: inherit
-
-  build-docker-centos-7:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: centos-7
-      single-package: true
-      containerized: false
-      cmake-configuration-ex: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
-    secrets: inherit
-
-  build-docker-amazonlinux:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: amazonlinux
-      single-package: true
-      containerized: false
-      cmake-configuration-ex: "-DVCPKG_TARGET_TRIPLET=x64-amazonlinux-dynamic"
-    secrets: inherit
-
-  build-gh_runner-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      single-package: true
-      containerized: false
-      upload-package: true
-      asset-name: 'gh_runner-package'
-    secrets: inherit
-
-  test-smoke-gh_runner-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-gh_runner-ubuntu-22_04
-    uses: ./.github/workflows/test-smoke-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'gh_runner-package'
-    secrets: inherit
-
-  test-unit-gh_runner-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-gh_runner-ubuntu-22_04
-    uses: ./.github/workflows/test-unit-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'gh_runner-package'
-    secrets: inherit
-
-  test-ui-gh_runner-ubuntu-22_04:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    needs: build-gh_runner-ubuntu-22_04
-    uses: ./.github/workflows/test-ui-gh_runner.yml
-    with:
-      os: ubuntu-22.04
-      asset-name: 'gh_runner-package'
-    secrets: inherit
-
-  build-gh_runner-ubuntu-20_04:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: ubuntu-20.04
-      single-package: true
-      containerized: false
-    secrets: inherit
-
-  build-gh_runner-windows-2022:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: windows-2022
-      single-package: true
-      containerized: false
-      cmake-configuration: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
-    secrets: inherit
-
-  build-gh_runner-windows-2019:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: windows-2019
-      single-package: true
-      containerized: false
-      cmake-configuration: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
-    secrets: inherit
-
-  build-gh_runner-macos-12:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: macos-12
-      single-package: true
-      containerized: false
-      build-type: 'Release'
-      cmake-configuration: '-DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
-    secrets: inherit
-
-  build-gh_runner-macos-11:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-gh_runner.yml
-    with:
-      os: macos-11
-      single-package: true
-      containerized: false
-      build-type: 'Release'
-      cmake-configuration: '-DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
-    secrets: inherit
+  build-docker:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-23.10
+            trigger: 'pull_request,push'
+          - os: ubuntu-22.04
+            trigger: 'pull_request,push'
+            test: true
+          - os: ubuntu-20.04
+            trigger: 'schedule,push'
+          - os: centos-8
+            trigger: 'schedule,push'
+          - os: centos-7
+            trigger: 'pull_request,push'
+          - os: amazonlinux
+            trigger: 'schedule,push'
+          - os: windows-2022
+            trigger: 'pull_request,push'
+
+    steps:
+      - name: build-docker
+        uses: ./.github/workflows/build-docker.yml
+        if: ${{ contains(matrix.trigger, github.event_name) }}
+        with:
+          os: ${{ matrix.os }}
+          upload-package: ${{ matrix.test == true }}
+          asset-name: 'docker-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-smoke-docker
+        uses: ./.github/workflows/test-smoke-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'docker-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-unit-docker
+        uses: ./.github/workflows/test-unit-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'docker-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-ui-docker
+        uses: ./.github/workflows/test-ui-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'docker-${{ matrix.os }}-package'
+          secrets: inherit
+
+  build-gh-runner:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            trigger: 'pull_request,push'
+            test: true
+          - os: ubuntu-20.04
+            trigger: 'schedule,push'
+          - os: windows-2022
+            trigger: 'schedule,push'
+          - os: windows-2019
+            trigger: 'pull_request,push'
+          - os: macos-12
+            trigger: 'schedule,push'
+          - os: macos-11
+            trigger: 'pull_request,push'
+
+    steps:
+      - name: build-gh_runner
+        uses: ./.github/workflows/build-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) }}
+        with:
+          os: ${{ matrix.os }}
+          upload-package: ${{ matrix.test == true }}
+          asset-name: 'gh_runner-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-smoke-gh_runner
+        uses: ./.github/workflows/test-smoke-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'gh_runner-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-unit-gh_runner
+        uses: ./.github/workflows/test-unit-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'gh_runner-${{ matrix.os }}-package'
+          secrets: inherit
+
+      - name: test-ui-gh_runner
+        uses: ./.github/workflows/test-ui-gh_runner.yml
+        if: ${{ contains(matrix.trigger, github.event_name) && matrix.test == true }}
+        with:
+          os: ${{ matrix.os }}
+          asset-name: 'gh_runner-${{ matrix.os }}-package'
+          secrets: inherit