diff --git a/.github/workflows/build-and-test-multiplatform.yml b/.github/workflows/build-and-test-multiplatform.yml index 6ece76dae9..3736b37027 100644 --- a/.github/workflows/build-and-test-multiplatform.yml +++ b/.github/workflows/build-and-test-multiplatform.yml @@ -88,23 +88,6 @@ jobs: artifact-name: install-windows-x64 github-token: ${{ secrets.GITHUB_TOKEN }} - prepare-and-build-windows-arm64: - name: Prepare and Build on Windows with MSVC (ARM64) - runs-on: windows-11-arm - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - - - name: Build OCCT - uses: ./.github/actions/build-occt - with: - platform: windows - compiler: msvc - target-arch: arm64 - artifact-name: install-windows-arm64 - github-token: ${{ secrets.GITHUB_TOKEN }} - prepare-and-build-macos-x64: name: Prepare and Build on macOS with Clang (x64) runs-on: macos-15 @@ -177,25 +160,6 @@ jobs: test-directory-name: windows-x64 test-script: .github/actions/testgrid/testwindows.tcl - test-windows-arm64: - name: Test on Windows (arm64) - runs-on: windows-11-arm - needs: prepare-and-build-windows-arm64 - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - - - name: Run tests - uses: ./.github/actions/run-tests - with: - platform: windows - compiler: msvc - target-arch: arm64 - install-artifact-name: install-windows-arm64 - test-directory-name: windows-arm64 - test-script: .github/actions/testgrid/testwindowsarm.tcl - retest-windows-x64: name: Regression Test on Windows (x64) runs-on: windows-2025 @@ -214,25 +178,6 @@ jobs: results-artifact-name: results-windows-x64 test-directory-name: windows-x64 - retest-windows-arm64: - name: Regression Test on Windows (arm64) - runs-on: windows-11-arm - needs: test-windows-arm64 - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - - - name: Run retest - uses: ./.github/actions/retest-failures - with: - platform: windows - compiler: msvc - target-arch: arm64 - install-artifact-name: install-windows-arm64 - results-artifact-name: results-windows-arm64 - test-directory-name: windows-arm64 - test-macos-x64: name: Test on macOS (x64) runs-on: macos-15 @@ -322,24 +267,6 @@ jobs: install-artifact-name: install-windows-x64 artifact-suffix: x64 - run-gtest-windows-arm64: - name: Run GTest on Windows with MSVC (arm64) - needs: prepare-and-build-windows-arm64 - runs-on: windows-11-arm - - steps: - - name: Checkout repository - uses: actions/checkout@v4.2.2 - - - name: Run GTests - uses: ./.github/actions/run-gtest - with: - platform: windows - compiler: msvc - target-arch: arm64 - install-artifact-name: install-windows-arm64 - artifact-suffix: arm64 - run-gtest-macos-x64: name: Run GTest on macOS with Clang (x64) needs: prepare-and-build-macos-x64 diff --git a/.github/workflows/master-validation.yml b/.github/workflows/master-validation.yml index 9b1384b362..b1f8e42363 100644 --- a/.github/workflows/master-validation.yml +++ b/.github/workflows/master-validation.yml @@ -140,6 +140,84 @@ jobs: use-vtk: "OFF" use-tbb: "OFF" + # Windows ARM64 test lane moved from PR validation. + windows-arm64-prepare-build: + if: github.repository == 'Open-Cascade-SAS/OCCT' + name: Windows ARM64 build + runs-on: windows-11-arm + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Build OCCT + uses: ./.github/actions/build-occt + with: + platform: windows + compiler: msvc + target-arch: arm64 + artifact-name: install-windows-arm64 + github-token: ${{ secrets.GITHUB_TOKEN }} + + windows-arm64-test: + if: github.repository == 'Open-Cascade-SAS/OCCT' + name: Test on Windows (arm64) + runs-on: windows-11-arm + needs: windows-arm64-prepare-build + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Run tests + uses: ./.github/actions/run-tests + with: + platform: windows + compiler: msvc + target-arch: arm64 + install-artifact-name: install-windows-arm64 + test-directory-name: windows-arm64 + test-script: .github/actions/testgrid/testwindowsarm.tcl + + windows-arm64-retest: + if: github.repository == 'Open-Cascade-SAS/OCCT' + name: Regression Test on Windows (arm64) + runs-on: windows-11-arm + needs: windows-arm64-test + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Run retest + uses: ./.github/actions/retest-failures + with: + platform: windows + compiler: msvc + target-arch: arm64 + install-artifact-name: install-windows-arm64 + results-artifact-name: results-windows-arm64 + test-directory-name: windows-arm64 + + windows-arm64-gtest: + if: github.repository == 'Open-Cascade-SAS/OCCT' + name: Run GTest on Windows with MSVC (arm64) + needs: windows-arm64-prepare-build + runs-on: windows-11-arm + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Run GTests + uses: ./.github/actions/run-gtest + with: + platform: windows + compiler: msvc + target-arch: arm64 + install-artifact-name: install-windows-arm64 + artifact-suffix: arm64 + # Ubuntu builds ubuntu: if: github.repository == 'Open-Cascade-SAS/OCCT'