From 901df79d86d99472eafd3966967b60faddf13f2a Mon Sep 17 00:00:00 2001 From: m Date: Sat, 19 Sep 2026 18:34:23 +0200 Subject: [PATCH] fix pipeline version --- .gitea/workflows/ci.yml | 22 ++++++++++++++++++---- .gitea/workflows/release.yml | 9 ++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 5df23cf..3b9b0b8 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -8,7 +8,7 @@ # - Droits d'écriture du runner sur son répertoire de travail/cache. # # Secrets (Settings > Actions) : -# - CONTAINER_REGISTRY_TOKEN PAT scope write:packages (registre conteneur) +# - CONTAINER_REGISTRY_TOKEN PAT scope write:package (registre conteneur) # - CONTAINER_REGISTRY_USER utilisateur propriétaire du PAT ci-dessus name: CI @@ -25,7 +25,7 @@ on: env: GO_VERSION: "1.26" - ANDROID_IMAGE: cimg/android:2024.01 + ANDROID_IMAGE: cimg/android:2024.01-node CGO_ENABLED: "0" # Registre conteneur Gitea (ex: cname de l'instance) REGISTRY_HOST: gitea.thirdshop.fr @@ -35,6 +35,11 @@ jobs: runs-on: ubuntu-24.04 container: golang:${{ env.GO_VERSION }}-alpine steps: + # golang:alpine n'a ni node ni git — requis par les actions JS + # (checkout/cache) exécutées dans le container par act_runner. + - name: Install node + git (actions JS) + run: apk add --no-cache nodejs git + - uses: actions/checkout@v4 - uses: actions/cache@v4 @@ -80,6 +85,9 @@ jobs: POSTGRES_USER: kazier POSTGRES_PASSWORD: kazier steps: + - name: Install node + git (actions JS) + run: apk add --no-cache nodejs git + - uses: actions/checkout@v4 - uses: actions/cache@v4 with: @@ -115,10 +123,13 @@ jobs: container: golang:${{ env.GO_VERSION }}-alpine needs: [lint-backend, test-backend] steps: + - name: Install node + git (actions JS) + run: apk add --no-cache nodejs git + - uses: actions/checkout@v4 - run: | export VERSION="$(cat VERSION)" - CGO_ENABLED=0 GOOS=ubuntu-24.04 go build \ + CGO_ENABLED=0 GOOS=linux go build \ -trimpath \ -ldflags "-s -w -X main.version=${VERSION}" \ -o bin/kazier-server \ @@ -147,6 +158,9 @@ jobs: docker: image: docker:27-dind steps: + - name: Install node + git (actions JS) + run: apk add --no-cache nodejs git + - uses: actions/checkout@v4 - name: Login registre Gitea @@ -154,7 +168,7 @@ jobs: CONTAINER_REGISTRY_TOKEN: ${{ secrets.CONTAINER_REGISTRY_TOKEN }} CONTAINER_REGISTRY_USER: ${{ secrets.CONTAINER_REGISTRY_USER }} run: | - : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:packages)}" + : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:package)}" : "${CONTAINER_REGISTRY_USER:?CONTAINER_REGISTRY_USER manquant (propriétaire du PAT)}" echo "$CONTAINER_REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$CONTAINER_REGISTRY_USER" --password-stdin echo "REGISTRY_IMAGE=${REGISTRY_HOST}/${{ github.repository_owner }}/kasier" >> "$GITHUB_ENV" diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 8303d99..cbca2a0 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -8,7 +8,7 @@ # - RELEASE_KEYSTORE_B64 base64 du keystore release Android (jamais en clair) # - SIGNING_STORE_PASSWORD SIGNING_KEY_ALIAS SIGNING_KEY_PASSWORD # - RELEASE_API_TOKEN PAT scope write:repository (API : création Release) -# - CONTAINER_REGISTRY_TOKEN PAT scope write:packages (registre conteneur Gitea) +# - CONTAINER_REGISTRY_TOKEN PAT scope write:package (registre conteneur Gitea) # - CONTAINER_REGISTRY_USER utilisateur propriétaire du PAT ci-dessus # - DOCKERHUB_USER DOCKERHUB_TOKEN PAT Docker Hub (push public) @@ -19,7 +19,7 @@ on: tags: ["v*"] env: - ANDROID_IMAGE: cimg/android:2024.01 + ANDROID_IMAGE: cimg/android:2024.01-node DOCKERHUB_IMAGE: docker.io/thirdshop/kasier # API Gitea (host de l'instance) API_HOST: gitea.thirdshop.fr @@ -90,6 +90,9 @@ jobs: docker: image: docker:27-dind steps: + - name: Install node + git (actions JS) + run: apk add --no-cache nodejs git + - uses: actions/checkout@v4 - name: Login registre Gitea @@ -97,7 +100,7 @@ jobs: CONTAINER_REGISTRY_TOKEN: ${{ secrets.CONTAINER_REGISTRY_TOKEN }} CONTAINER_REGISTRY_USER: ${{ secrets.CONTAINER_REGISTRY_USER }} run: | - : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:packages)}" + : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:package)}" : "${CONTAINER_REGISTRY_USER:?CONTAINER_REGISTRY_USER manquant (propriétaire du PAT)}" echo "$CONTAINER_REGISTRY_TOKEN" | docker login "$API_HOST" -u "$CONTAINER_REGISTRY_USER" --password-stdin echo "REGISTRY_IMAGE=${API_HOST}/${{ github.repository_owner }}/kasier" >> "$GITHUB_ENV"