From 477cdbb711774798995a93a639ffae71c58c3b37 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Sat, 18 Oct 2025 22:45:43 +0200 Subject: [PATCH] Use yaml anchors in ci workflow (2) (#154680) --- .github/workflows/ci.yaml | 20 ++++++------ .github/workflows/wheels.yml | 61 +++++++++++++++--------------------- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index aaefd47a553..3ec09f68a52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -428,7 +428,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - python-version: ${{ fromJSON(needs.info.outputs.python_versions) }} + python-version: &matrix-python ${{ fromJson(needs.info.outputs.python_versions) }} steps: - *checkout - &setup-python-matrix @@ -514,9 +514,7 @@ jobs: if: steps.cache-apt-check.outputs.cache-hit != 'true' uses: &actions-cache-save actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: - path: | - ${{ env.APT_CACHE_DIR }} - ${{ env.APT_LIST_CACHE_DIR }} + path: *path-apt-cache key: *key-apt-cache - name: Create Python virtual environment if: steps.cache-venv.outputs.cache-hit != 'true' @@ -641,7 +639,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ${{ fromJson(needs.info.outputs.python_versions) }} + python-version: *matrix-python steps: - *checkout - *setup-python-matrix @@ -838,8 +836,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ${{ fromJson(needs.info.outputs.python_versions) }} - group: ${{ fromJson(needs.info.outputs.test_groups) }} + python-version: *matrix-python + group: &matrix-group ${{ fromJson(needs.info.outputs.test_groups) }} steps: - *cache-restore-apt - name: Install additional OS dependencies @@ -964,7 +962,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ${{ fromJson(needs.info.outputs.python_versions) }} + python-version: *matrix-python mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }} steps: - *cache-restore-apt @@ -1081,7 +1079,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ${{ fromJson(needs.info.outputs.python_versions) }} + python-version: *matrix-python postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }} steps: - *cache-restore-apt @@ -1218,8 +1216,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ${{ fromJson(needs.info.outputs.python_versions) }} - group: ${{ fromJson(needs.info.outputs.test_groups) }} + python-version: *matrix-python + group: *matrix-group steps: - *cache-restore-apt - name: Install additional OS dependencies diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b6a4d0832f7..251d586c119 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -31,7 +31,8 @@ jobs: outputs: architectures: ${{ steps.info.outputs.architectures }} steps: - - name: Checkout the repository + - &checkout + name: Checkout the repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} @@ -91,7 +92,7 @@ jobs: ) > build_constraints.txt - name: Upload env_file - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: &actions-upload-artifact actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: env_file path: ./.env_file @@ -99,14 +100,14 @@ jobs: overwrite: true - name: Upload build_constraints - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: *actions-upload-artifact with: name: build_constraints path: ./build_constraints.txt overwrite: true - name: Upload requirements_diff - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: *actions-upload-artifact with: name: requirements_diff path: ./requirements_diff.txt @@ -118,7 +119,7 @@ jobs: python -m script.gen_requirements_all ci - name: Upload requirements_all_wheels - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: *actions-upload-artifact with: name: requirements_all_wheels path: ./requirements_all_wheels_*.txt @@ -130,25 +131,27 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false - matrix: + matrix: &matrix-build abi: ["cp313"] arch: ${{ fromJson(needs.init.outputs.architectures) }} steps: - - name: Checkout the repository - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - *checkout - - name: Download env_file - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + - &download-env-file + name: Download env_file + uses: &actions-download-artifact actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: env_file - - name: Download build_constraints - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + - &download-build-constraints + name: Download build_constraints + uses: *actions-download-artifact with: name: build_constraints - - name: Download requirements_diff - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + - &download-requirements-diff + name: Download requirements_diff + uses: *actions-download-artifact with: name: requirements_diff @@ -160,7 +163,7 @@ jobs: # home-assistant/wheels doesn't support sha pinning - name: Build wheels - uses: home-assistant/wheels@2025.09.1 + uses: &home-assistant-wheels home-assistant/wheels@2025.09.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 @@ -180,30 +183,16 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false - matrix: - abi: ["cp313"] - arch: ${{ fromJson(needs.init.outputs.architectures) }} + matrix: *matrix-build steps: - - name: Checkout the repository - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - *checkout - - name: Download env_file - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 - with: - name: env_file - - - name: Download build_constraints - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 - with: - name: build_constraints - - - name: Download requirements_diff - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 - with: - name: requirements_diff + - *download-env-file + - *download-build-constraints + - *download-requirements-diff - name: Download requirements_all_wheels - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 + uses: *actions-download-artifact with: name: requirements_all_wheels @@ -221,7 +210,7 @@ jobs: # home-assistant/wheels doesn't support sha pinning - name: Build wheels - uses: home-assistant/wheels@2025.09.1 + uses: *home-assistant-wheels with: abi: ${{ matrix.abi }} tag: musllinux_1_2