From f51f53b8f534d2d233a09eacb8b3df856cf78d6f Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 17:10:20 -0700 Subject: [PATCH 1/8] Move test to github actions. We are moving tests to actions to reduce the maintenance effort. --- .github/workflows/tests.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..e13fa6cb --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,30 @@ +name: Tests +on: + push: + branches: + - main + pull_request: + +# Declare default permissions as read only. +permissions: read-all + +jobs: + test_win: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + include: + - name: tests-linux-0 + shards: 3 + shard-index: 0 + - name: tests-linux-1 + shards: 3 + shard-index: 1 + - name: tests-linux-2 + shards: 3 + shard-index: 2 + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - name: ${{ matrix.name }} + run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} From ea06d89ae7284d37bb4442803da8ca4508a16cfe Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 17:23:42 -0700 Subject: [PATCH 2/8] Fix indentation. --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e13fa6cb..2600e050 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: - name: tests-linux-2 shards: 3 shard-index: 2 - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - - name: ${{ matrix.name }} - run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - name: ${{ matrix.name }} + run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} From 9ad3b45f4e9af6bd9d6f6675eb59f2e4a4149941 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 17:30:43 -0700 Subject: [PATCH 3/8] Add windows. --- .github/workflows/tests.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2600e050..6ae6e1b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ on: permissions: read-all jobs: - test_win: + test_linux: runs-on: ubuntu-latest strategy: fail-fast: true @@ -28,3 +28,28 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} + test_windows: + runs-on: windows-latest + strategy: + fail-fast: true + matrix: + include: + - name: tests-windows-0 + shards: 5 + shard-index: 0 + - name: tests-windows-1 + shards: 5 + shard-index: 1 + - name: tests-windows-2 + shards: 5 + shard-index: 2 + - name: tests-windows-3 + shards: 5 + shard-index: 3 + - name: tests-windows-4 + shards: 5 + shard-index: 4 + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - name: ${{ matrix.name }} + run: scripts\verify_tests_on_master.bat --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} From ae191e750a2d30017ccf42836458a96252c7a43a Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 17:46:49 -0700 Subject: [PATCH 4/8] Add macos and skp-generator. --- .github/workflows/tests.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ae6e1b9..ea37d504 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,14 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} + test_linux: + runs-on: ubuntu-latest + strategy: + fail-fast: true + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - name: skp_generator + run: (cd skp_generator && ./build.sh) test_windows: runs-on: windows-latest strategy: @@ -53,3 +61,19 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts\verify_tests_on_master.bat --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} + test_mac: + runs-on: macos-latest + strategy: + fail-fast: true + matrix: + include: + - name: tests-macos-0 + shards: 2 + shard-index: 0 + - name: tests-macos-1 + shards: 2 + shard-index: 1 + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + - name: ${{ matrix.name }} + run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} From 8793405c9aee8049d358720e792cb113b0dbe07b Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 17:49:02 -0700 Subject: [PATCH 5/8] Remove duplicated name. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea37d504..3a1d6f32 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} - test_linux: + skp_generator: runs-on: ubuntu-latest strategy: fail-fast: true From c34a968d37bd6830802dfe13121c5fb21dd58f20 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 24 Aug 2023 18:18:26 -0700 Subject: [PATCH 6/8] Remove cirrus. --- .cirrus.yml | 81 ----------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 973bb56f..00000000 --- a/.cirrus.yml +++ /dev/null @@ -1,81 +0,0 @@ -task: - name: tests-linux-0 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts/verify_tests_on_master.sh --shards 3 --shard-index 0 - container: - image: gcc:latest - -task: - name: tests-linux-1 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts/verify_tests_on_master.sh --shards 3 --shard-index 1 - container: - image: gcc:latest - -task: - name: tests-linux-2 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts/verify_tests_on_master.sh --shards 3 --shard-index 2 - container: - image: gcc:latest - -task: - name: tests-windows-0 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts\verify_tests_on_master.bat --shards 5 --shard-index 0 - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - -task: - name: tests-windows-1 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts\verify_tests_on_master.bat --shards 5 --shard-index 1 - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - -task: - name: tests-windows-2 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts\verify_tests_on_master.bat --shards 5 --shard-index 2 - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - -task: - name: tests-windows-3 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts\verify_tests_on_master.bat --shards 5 --shard-index 3 - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - -task: - name: tests-windows-4 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts\verify_tests_on_master.bat --shards 5 --shard-index 4 - windows_container: - image: cirrusci/windowsservercore:2019 - os_version: 2019 - -task: - name: tests-macos-0 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts/verify_tests_on_master.sh --shards 2 --shard-index 0 - osx_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2 - -task: - name: tests-macos-1 - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: scripts/verify_tests_on_master.sh --shards 2 --shard-index 1 - osx_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2 - -task: - name: skp_generator - use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' - script: (cd skp_generator && ./build.sh) - container: - image: gcc:latest From 8ebf9a5f78bc641ded70374357598c8b51073f46 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 25 Aug 2023 08:50:37 -0700 Subject: [PATCH 7/8] Update names and add configurations. --- .github/workflows/tests.yml | 49 ++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3a1d6f32..c17391dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,3 +1,6 @@ +# This file contains configurations to run customer_tests using +# github actions. To learn more about github actions and how to +# update this file please refer to https://docs.github.com/en/actions. name: Tests on: push: @@ -9,26 +12,23 @@ on: permissions: read-all jobs: - test_linux: + tests for linux: runs-on: ubuntu-latest strategy: fail-fast: true matrix: include: - - name: tests-linux-0 - shards: 3 + - name: shard 1 of 3 shard-index: 0 - - name: tests-linux-1 - shards: 3 + - name: shard 2 of 3 shard-index: 1 - - name: tests-linux-2 - shards: 3 + - name: shard 3 of 32 shard-index: 2 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} - run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} - skp_generator: + run: scripts/verify_tests_on_master.sh --shards 3 --shard-index ${{ matrix.shard-index }} + tests for skp_generator: runs-on: ubuntu-latest strategy: fail-fast: true @@ -36,44 +36,37 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: skp_generator run: (cd skp_generator && ./build.sh) - test_windows: + tests for windows: runs-on: windows-latest strategy: fail-fast: true matrix: include: - - name: tests-windows-0 - shards: 5 - shard-index: 0 - - name: tests-windows-1 - shards: 5 + - name: shard 1 of 5 + shard-index: 0 + - name: shard 2 of 5 shard-index: 1 - - name: tests-windows-2 - shards: 5 + - name: shard 3 of 5 shard-index: 2 - - name: tests-windows-3 - shards: 5 + - name: shardd 4 of 5 shard-index: 3 - - name: tests-windows-4 - shards: 5 + - name: shard 5 of 5 shard-index: 4 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} - run: scripts\verify_tests_on_master.bat --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} - test_mac: + run: scripts\verify_tests_on_master.bat --shards 5 --shard-index ${{ matrix.shard-index }} + tests for macos: runs-on: macos-latest strategy: fail-fast: true matrix: include: - - name: tests-macos-0 - shards: 2 + - name: shard 1 of 2 shard-index: 0 - - name: tests-macos-1 - shards: 2 + - name: shard 2 of 2 shard-index: 1 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} - run: scripts/verify_tests_on_master.sh --shards ${{ matrix.shards }} --shard-index ${{ matrix.shard-index }} + run: scripts/verify_tests_on_master.sh --shards 2 --shard-index ${{ matrix.shard-index }} From dc1e9747b15cd785e8177b9d03765b3acec224cb Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 25 Aug 2023 08:52:40 -0700 Subject: [PATCH 8/8] Fix job names which are required to follow an identifer syntax. --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c17391dc..81355806 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ on: permissions: read-all jobs: - tests for linux: + linux_tests: runs-on: ubuntu-latest strategy: fail-fast: true @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts/verify_tests_on_master.sh --shards 3 --shard-index ${{ matrix.shard-index }} - tests for skp_generator: + skp_generator_tests: runs-on: ubuntu-latest strategy: fail-fast: true @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: skp_generator run: (cd skp_generator && ./build.sh) - tests for windows: + windows_tests: runs-on: windows-latest strategy: fail-fast: true @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: ${{ matrix.name }} run: scripts\verify_tests_on_master.bat --shards 5 --shard-index ${{ matrix.shard-index }} - tests for macos: + macos_tests: runs-on: macos-latest strategy: fail-fast: true