From 42137172e28587124a91d8c30b48f7734ae1055a Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Thu, 1 Aug 2024 11:56:04 +0300 Subject: [PATCH] fix workflows and build.yaml --- .github/workflows/jh-builder.yml | 32 ++++++++++++------------ .github/workflows/jh-translations.yml | 8 +++--- .github/workflows/jh-wheels.yml | 36 +++++++++++++-------------- build-jethub.yaml | 10 ++++---- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/jh-builder.yml b/.github/workflows/jh-builder.yml index 3b090733e37b4..4e99f9134172a 100644 --- a/.github/workflows/jh-builder.yml +++ b/.github/workflows/jh-builder.yml @@ -10,7 +10,7 @@ on: env: BUILD_TYPE: core - DEFAULT_PYTHON: "3.12.3" + DEFAULT_PYTHON: "3.12" PIP_TIMEOUT: 60 UV_HTTP_TIMEOUT: 60 UV_SYSTEM_PYTHON: "true" @@ -27,7 +27,7 @@ jobs: publish: ${{ steps.version.outputs.publish }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0 @@ -35,7 +35,7 @@ jobs: run: cp -f build-jethub.yaml build.yaml - name: Set up Python ${{ env.DEFAULT_PYTHON }} - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.1.1 with: python-version: ${{ env.DEFAULT_PYTHON }} @@ -74,7 +74,7 @@ jobs: run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T - - name: Upload translations - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.4 with: name: translations path: translations.tar.gz @@ -96,14 +96,14 @@ jobs: arch: ${{ fromJson(needs.init.outputs.architectures) }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: update build.yaml run: cp -f build-jethub.yaml build.yaml - name: Download nightly wheels of frontend if: needs.init.outputs.channel == 'dev' - uses: dawidd6/action-download-artifact@v3.1.4 + uses: dawidd6/action-download-artifact@v6 with: github_token: ${{secrets.GITHUB_TOKEN}} repo: home-assistant/frontend @@ -114,7 +114,7 @@ jobs: - name: Download nightly wheels of intents if: needs.init.outputs.channel == 'dev' - uses: dawidd6/action-download-artifact@v3.1.4 + uses: dawidd6/action-download-artifact@v6 with: github_token: ${{secrets.GITHUB_TOKEN}} repo: home-assistant/intents-package @@ -125,7 +125,7 @@ jobs: - name: Set up Python ${{ env.DEFAULT_PYTHON }} if: needs.init.outputs.channel == 'dev' - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.1.1 with: python-version: ${{ env.DEFAULT_PYTHON }} @@ -191,7 +191,7 @@ jobs: sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt - name: Download translations - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: translations @@ -206,7 +206,7 @@ jobs: echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -261,7 +261,7 @@ jobs: - tinker steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: update build.yaml run: cp -f build-jethub.yaml build.yaml @@ -278,7 +278,7 @@ jobs: fi - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -300,7 +300,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: update build.yaml run: cp -f build-jethub.yaml build.yaml @@ -343,7 +343,7 @@ jobs: registry: ["ghcr.io/jethub-homeassistant", "cr.jethome.work/ha"] steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Install Cosign uses: sigstore/cosign-installer@v3.5.0 @@ -355,7 +355,7 @@ jobs: - name: Login to DockerHub if: matrix.registry == 'cr.jethome.work/ha' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: cr.jethome.work username: ${{ secrets.CR_USERNAME }} @@ -363,7 +363,7 @@ jobs: - name: Login to GitHub Container Registry if: matrix.registry == 'ghcr.io/jethub-homeassistant' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/jh-translations.yml b/.github/workflows/jh-translations.yml index d112ded1bc428..e1d96388d1836 100644 --- a/.github/workflows/jh-translations.yml +++ b/.github/workflows/jh-translations.yml @@ -13,7 +13,7 @@ on: - "**strings.json" env: - DEFAULT_PYTHON: "3.12.3" + DEFAULT_PYTHON: "3.12" jobs: upload: @@ -22,10 +22,12 @@ jobs: runs-on: ${{ vars.RUNNER }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 + with: + fetch-depth: 0 - name: Set up Python ${{ env.DEFAULT_PYTHON }} - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.1.1 with: python-version: ${{ env.DEFAULT_PYTHON }} diff --git a/.github/workflows/jh-wheels.yml b/.github/workflows/jh-wheels.yml index 47fa70bfb3eb0..1dc008d8620dd 100644 --- a/.github/workflows/jh-wheels.yml +++ b/.github/workflows/jh-wheels.yml @@ -19,7 +19,7 @@ on: workflow_call: env: - DEFAULT_PYTHON: "3.12.3" + DEFAULT_PYTHON: "3.12" concurrency: group: ${{ github.workflow }}-${{ github.ref_name}} @@ -34,11 +34,11 @@ jobs: architectures: ${{ steps.info.outputs.architectures }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Set up Python ${{ env.DEFAULT_PYTHON }} id: python - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.1.1 with: python-version: ${{ env.DEFAULT_PYTHON }} check-latest: true @@ -84,14 +84,14 @@ jobs: ) > .env_file - name: Upload env_file - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.4 with: name: env_file path: ./.env_file overwrite: true - name: Upload requirements_diff - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.4 with: name: requirements_diff path: ./requirements_diff.txt @@ -103,7 +103,7 @@ jobs: python -m script.gen_requirements_all ci - name: Upload requirements_all_wheels - uses: actions/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.4 with: name: requirements_all_wheels path: ./requirements_all_wheels_*.txt @@ -120,20 +120,20 @@ jobs: arch: ${{ fromJson(needs.init.outputs.architectures) }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Download env_file - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: env_file - name: Download requirements_diff - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: requirements_diff - name: Build wheels - uses: jethub-homeassistant/wheels@2024.01.0 + uses: jethub-homeassistant/wheels@2024.07.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 @@ -158,20 +158,20 @@ jobs: arch: ${{ fromJson(needs.init.outputs.architectures) }} steps: - name: Checkout the repository - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Download env_file - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: env_file - name: Download requirements_diff - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: requirements_diff - name: Download requirements_all_wheels - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: requirements_all_wheels @@ -205,7 +205,7 @@ jobs: sed -i "/numpy/d" homeassistant/package_constraints.txt - name: Build wheels (old cython) - uses: jethub-homeassistant/wheels@2024.01.0 + uses: jethub-homeassistant/wheels@2024.07.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 @@ -220,7 +220,7 @@ jobs: pip: "'cython<3'" - name: Build wheels (part 1) - uses: jethub-homeassistant/wheels@2024.01.0 + uses: jethub-homeassistant/wheels@2024.07.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 @@ -234,7 +234,7 @@ jobs: requirements: "requirements_all.txtaa" - name: Build wheels (part 2) - uses: jethub-homeassistant/wheels@2024.01.0 + uses: jethub-homeassistant/wheels@2024.07.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 @@ -248,7 +248,7 @@ jobs: requirements: "requirements_all.txtab" - name: Build wheels (part 3) - uses: jethub-homeassistant/wheels@2024.01.0 + uses: jethub-homeassistant/wheels@2024.07.1 with: abi: ${{ matrix.abi }} tag: musllinux_1_2 diff --git a/build-jethub.yaml b/build-jethub.yaml index 33b40a96911cc..796fb89f3fcbb 100644 --- a/build-jethub.yaml +++ b/build-jethub.yaml @@ -1,10 +1,10 @@ image: ghcr.io/jethub-homeassistant/{arch}-homeassistant build_from: - aarch64: ghcr.io/jethub-homeassistant/aarch64-homeassistant-base:2024.03.0 - armhf: ghcr.io/jethub-homeassistant/armhf-homeassistant-base:2024.03.0 - armv7: ghcr.io/jethub-homeassistant/armv7-homeassistant-base:2024.03.0 - amd64: ghcr.io/jethub-homeassistant/amd64-homeassistant-base:2024.03.0 - i386: ghcr.io/jethub-homeassistant/i386-homeassistant-base:2024.03.0 + aarch64: ghcr.io/jethub-homeassistant/aarch64-homeassistant-base:2024.06.1 + armhf: ghcr.io/jethub-homeassistant/armhf-homeassistant-base:2024.06.1 + armv7: ghcr.io/jethub-homeassistant/armv7-homeassistant-base:2024.06.1 + amd64: ghcr.io/jethub-homeassistant/amd64-homeassistant-base:2024.06.1 + i386: ghcr.io/jethub-homeassistant/i386-homeassistant-base:2024.06.1 codenotary: signer: vb@jethome.ru base_image: vb@jethome.ru