diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 41e9f1d9..0577b622 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -2,7 +2,7 @@ name: Code Quality on: pull_request: - branches: [ mainline, feature_windows ] + branches: [ mainline ] workflow_call: inputs: branch: @@ -11,7 +11,7 @@ on: jobs: UnitTest: - name: Python + name: Unit Tests - {{ matrix.os }}, python {{ matrix.python-version }} strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] @@ -20,10 +20,11 @@ jobs: with: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} + IntegrationTests: - name: Integration Tests - {{ matrix.os }}, python {{ matrix.python-version }} + name: Integration Tests - ${{ matrix.os }}, python ${{ matrix.python-version }} needs: UnitTest - runs-on: {{ matrix.os }} + runs-on: ${{ matrix.os }} permissions: contents: read strategy: @@ -38,4 +39,4 @@ jobs: pip install --upgrade hatch - name: Run Integration Tests - run: hatch run integ-test \ No newline at end of file + run: hatch run integ-test diff --git a/.github/workflows/mainline_e2e_canary.yml b/.github/workflows/mainline_e2e_canary.yml index 2139f5d9..ae6aea95 100644 --- a/.github/workflows/mainline_e2e_canary.yml +++ b/.github/workflows/mainline_e2e_canary.yml @@ -7,8 +7,8 @@ on: jobs: IntegrationTests: - name: Integration Tests - {{ matrix.os }}, python {{ matrix.python-version }} - runs-on: {{ matrix.os }} + name: Integration Tests - ${{ matrix.os }}, python ${{ matrix.python-version }} + runs-on: ${{ matrix.os }} permissions: contents: read strategy: diff --git a/.github/workflows/mainline_e2e_test.yml b/.github/workflows/mainline_e2e_test.yml index 8bb0e55c..1063d069 100644 --- a/.github/workflows/mainline_e2e_test.yml +++ b/.github/workflows/mainline_e2e_test.yml @@ -10,8 +10,8 @@ on: jobs: IntegrationTests: - name: Integration Tests - {{ matrix.os }}, python {{ matrix.python-version }} - runs-on: {{ matrix.os }} + name: Integration Tests - ${{ matrix.os }}, python ${{ matrix.python-version }} + runs-on: ${{ matrix.os }} permissions: contents: read strategy: diff --git a/.github/workflows/release_bump.yml b/.github/workflows/release_bump.yml index 23b90aa9..fde4a940 100644 --- a/.github/workflows/release_bump.yml +++ b/.github/workflows/release_bump.yml @@ -20,29 +20,6 @@ jobs: with: branch: mainline - IntegrationTests: - needs: UnitTests - name: Integration Tests - {{ matrix.os }}, python {{ matrix.python-version }} - runs-on: {{ matrix.os }} - permissions: - id-token: write - contents: read - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11'] - env: - PYTHON: ${{ matrix.python-version }} - steps: - - uses: actions/checkout@v4 - - - name: Install Hatch - run: | - pip install --upgrade hatch - - - name: Run Integration Tests - run: hatch run integ-test - LinuxE2ETests: needs: UnitTests name: Linux E2E Test diff --git a/.github/workflows/release_e2e_canary.yml b/.github/workflows/release_e2e_canary.yml index 681aa542..91b80f3f 100644 --- a/.github/workflows/release_e2e_canary.yml +++ b/.github/workflows/release_e2e_canary.yml @@ -7,8 +7,8 @@ on: jobs: IntegrationTests: - name: Integration Tests - {{ matrix.os }}, python {{ matrix.python-version }} - runs-on: {{ matrix.os }} + name: Integration Tests - ${{ matrix.os }}, python ${{ matrix.python-version }} + runs-on: ${{ matrix.os }} permissions: contents: read strategy: