diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml index b824fd5..ef5ca1b 100644 --- a/.gitea/workflows/build-push.yaml +++ b/.gitea/workflows/build-push.yaml @@ -34,8 +34,12 @@ jobs: apt-get update apt-get install -y podman - - name: Checkout code - uses: actions/checkout@v4 + - name: Checkout and get version + id: get_version + uses: https://gargoton.petite-maison-orange.fr/pmo-actions/software-version@main + with: + git_checkout: true + version_file: ${{ env.RELEASE_FILE }} - name: Build image starting uses: https://gargoton.petite-maison-orange.fr/pmo-actions/healthchecks-ping@main @@ -43,20 +47,11 @@ jobs: check_server: ${{ env.CHECK_SERVER }} check_uuid: ${{ env.CHECK_UUID }} check_command: log - check_message: 'Buildind docker image for $(cat ${{ env.RELEASE_FILE }})' - - - - name: Read version file - id: version - run: | - # Lire le contenu du fichier et supprimer les espaces/retours chariots - SOFTVERSION=$(cat ${{ env.RELEASE_FILE }} | tr -d ' \n') - # Stocker la valeur dans une variable d'environnement - echo "SOFTVERSION=$SOFTVERSION" >> $GITEA_ENV + check_message: 'Buildind docker image for ${{ steps.get_version.outputs.version }})' - name: Add PMO version tag run: | - echo "IMAGE_TAGS=${{ env.IMAGE_TAGS }} pmo-${{ env.SOFTVERSION }}" >> $GITEA_ENV + echo "IMAGE_TAGS=${{ env.IMAGE_TAGS }} pmo-${{ steps.get_version.outputs.version }}" >> $GITEA_ENV - name: Build and tag image uses: https://gargoton.petite-maison-orange.fr/pmo-actions/build-image@main