From ddb8917a4610cc59e968c763f7da9f5559ef6431 Mon Sep 17 00:00:00 2001 From: Pjandro Date: Tue, 10 Nov 2026 02:20:34 +0300 Subject: [PATCH] =?UTF-8?q?CI:=20job'=D1=8B=20=D0=BD=D0=B0=20arm64-=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=B5=D1=80=D0=B5=20(ubuntu-latest-arm64),?= =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4-=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=B0=20amd64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/main.yml | 19 ++++++++++++------- .gitea/workflows/pr.yml | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index e217dbd..cd0817a 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -7,7 +7,7 @@ on: jobs: java: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 steps: - uses: actions/checkout@v5 @@ -106,7 +106,7 @@ jobs: PY web: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 steps: - uses: actions/checkout@v5 @@ -129,8 +129,13 @@ jobs: working-directory: wordpdf-web run: npm run lint + # Образы собираются только под amd64: прод-хост x86_64, а + # eclipse-temurin:17-jre-alpine не имеет arm64-варианта. Метку + # ubuntu-latest-amd64 объявляет только x86_64-раннер llm. + # Остальные job'ы идут на ubuntu-latest-arm64 — единственную метку, + # которую объявляет arm64-раннер rpi-arm64. images-app: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-amd64 needs: java steps: - uses: actions/checkout@v5 @@ -172,7 +177,7 @@ jobs: docker push "$REGISTRY/wordpdf-app:sha-$sha" images-web: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-amd64 needs: web steps: - uses: actions/checkout@v5 @@ -212,7 +217,7 @@ jobs: docker push "$REGISTRY/wordpdf-web:sha-$sha" deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 needs: [images-app, images-web] env: DEPLOY_HOST: ${{ vars.DEPLOY_HOST }} @@ -426,7 +431,7 @@ jobs: } | ssh "$@" "$H" bash -s autotests: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 needs: deploy steps: - uses: actions/checkout@v5 @@ -468,7 +473,7 @@ jobs: run: cd prod-autotests && ../.venv/bin/python -m pytest -q . rollback: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 needs: [deploy, autotests] if: failure() env: diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index aa3d135..a8dc7de 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -6,7 +6,7 @@ on: jobs: java: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 steps: - uses: actions/checkout@v5 @@ -105,7 +105,7 @@ jobs: PY web: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-arm64 steps: - uses: actions/checkout@v5