diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8bd7203..1c4536a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -56,6 +56,8 @@ Most parts in the Electron.NET project are fairly straight forward. Among these 7. Update the documentation to reflect any changes. (or document such changes in the original issue) 8. Push to your fork or push your issue-specific branch to the main repository, then submit a pull request against `develop`. +PR validation runs integration tests on Linux, Windows, and macOS (Intel and ARM64). A failing test marks its matrix job as failed; test results are still uploaded and aggregated, and the PR comment is published even when tests fail. Failed matrix jobs are automatically retried once. + Just to illustrate the git workflow for Electron.NET a little bit more we've added the following graphs. Initially, Electron.NET starts at the `main` branch. This branch should contain the latest stable (or released) version. diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5067cc2..2ee0f15 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-2025, macos-14, macos-15-intel, macos-26] + os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-2025, macos-15-intel, macos-26] electronVersion: ['30.4.0', '38.2.2'] include: - os: ubuntu-22.04 @@ -26,8 +26,6 @@ jobs: rid: win-x64 - os: windows-2025 rid: win-x64 - - os: macos-14 - rid: osx-arm64 - os: macos-15-intel rid: osx-x64 - os: macos-26 @@ -72,7 +70,6 @@ jobs: - name: Run tests (Linux) if: runner.os == 'Linux' - continue-on-error: true timeout-minutes: 15 run: | mkdir -p test-results @@ -85,7 +82,6 @@ jobs: - name: Run tests (Windows) if: runner.os == 'Windows' - continue-on-error: true timeout-minutes: 15 run: | New-Item -ItemType Directory -Force -Path test-results | Out-Null @@ -93,7 +89,6 @@ jobs: - name: Run tests (macOS) if: runner.os == 'macOS' - continue-on-error: true timeout-minutes: 15 run: | mkdir -p test-results @@ -200,16 +195,16 @@ jobs: GITHUB_TOKEN: ${{ github.token }} - name: Save PR Number - if: github.event_name == 'pull_request' + if: always() && github.event_name == 'pull_request' run: echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> $GITHUB_ENV - name: Write PR Number to File - if: github.event_name == 'pull_request' + if: always() && github.event_name == 'pull_request' run: echo "$PR_NUMBER" > pr_number.txt shell: bash - name: Upload PR Number Artifact - if: github.event_name == 'pull_request' + if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@v6 with: name: pr_number diff --git a/.github/workflows/retry-test-jobs.yml b/.github/workflows/retry-test-jobs.yml index 4e9dde7..465ef94 100644 --- a/.github/workflows/retry-test-jobs.yml +++ b/.github/workflows/retry-test-jobs.yml @@ -7,7 +7,7 @@ on: jobs: rerun-failed-matrix-jobs-once: - if: > + if: >- ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1