diff --git a/.gitea/workflows/build_publish-artifact.yml b/.gitea/workflows/build_publish-artifact.yml index 43db788..16758de 100644 --- a/.gitea/workflows/build_publish-artifact.yml +++ b/.gitea/workflows/build_publish-artifact.yml @@ -31,6 +31,9 @@ concurrency: jobs: check: runs-on: ubuntu-latest + outputs: + artifact_exists: ${{ steps.check.outputs.artifact_exists }} + next_version: ${{ steps.check.outputs.next_version }} steps: - uses: actions/checkout@v4 @@ -40,6 +43,7 @@ jobs: bash scripts/report-status.sh pending "Checking version..." ci-check - name: Check existing artifact and calculate version + id: check run: | RAW_VERSION=$(jq -r '.version' package.json) BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2) @@ -50,14 +54,12 @@ jobs: TAG=$(echo "$TAGS_JSON" | jq -r 'if type == "array" then .[] | select(.commit.sha == "${{ github.sha }}") | .name else empty end' | head -1) - mkdir -p /tmp/build-ctx - if [ -n "$TAG" ]; then - echo "ARTIFACT_EXISTS=true" > /tmp/build-ctx/build.env - echo "NEXT_VERSION=$TAG" >> /tmp/build-ctx/build.env + echo "artifact_exists=true" >> "$GITHUB_OUTPUT" + echo "next_version=$TAG" >> "$GITHUB_OUTPUT" echo "gitea-ci-library - Artefakti löytyi jo tagilla: $TAG." else - echo "ARTIFACT_EXISTS=false" > /tmp/build-ctx/build.env + echo "artifact_exists=false" >> "$GITHUB_OUTPUT" HIGHEST_PATCH=$(echo "$TAGS_JSON" | jq -r --arg bv "$BASE_VERSION." ' if type == "array" then .[] | .name | select(startswith($bv)) | sub($bv; "") | tonumber else empty end' | sort -rn | head -1) @@ -65,24 +67,21 @@ jobs: if [ -z "$HIGHEST_PATCH" ]; then NEXT_PATCH=0; else NEXT_PATCH=$((HIGHEST_PATCH + 1)); fi FULL_VERSION="${BASE_VERSION}.${NEXT_PATCH}" - echo "NEXT_VERSION=$FULL_VERSION" >> /tmp/build-ctx/build.env + echo "next_version=$FULL_VERSION" >> "$GITHUB_OUTPUT" echo "gitea-ci-library - Uusi vapaa versio: $FULL_VERSION" fi - - name: Upload build env artifact - uses: actions/upload-artifact@v3 - with: - name: build-context - path: /tmp/build-ctx/build.env - - name: Set Gitea status to SUCCESS if: success() + env: + EXISTS: ${{ steps.check.outputs.artifact_exists }} + VERSION: ${{ steps.check.outputs.next_version }} run: | - source /tmp/build-ctx/build.env - if [ "${ARTIFACT_EXISTS}" = "true" ]; then - bash scripts/report-status.sh success "Skip build: version $NEXT_VERSION exists" ci-check + echo "===== gitea-ci-library - Check existing artifact | success =====" + if [ "${EXISTS}" = "true" ]; then + bash scripts/report-status.sh success "Skip build: version $VERSION exists" ci-check else - bash scripts/report-status.sh success "Build version $NEXT_VERSION required" ci-check + bash scripts/report-status.sh success "Build version $VERSION required" ci-check fi - name: Set Gitea status to FAILURE @@ -91,99 +90,55 @@ jobs: quality-gate: needs: [check] + if: needs.check.outputs.artifact_exists == 'false' uses: niko/gitea-ci-library/.gitea/workflows/quality-gate.yml@main secrets: inherit with: env_json: ${{ inputs.env_json }} bats-image: ${{ inputs.bats-image }} cucumber-node-image: ${{ inputs.cucumber-node-image }} - build: runs-on: ubuntu-latest needs: [check, quality-gate] - # PAKOTETAAN KÄYNTIIN: always() ohittaa Gitean dynaamisen skippausbugin - if: always() + if: needs.quality-gate.result == 'success' && needs.check.outputs.artifact_exists == 'false' steps: - uses: actions/checkout@v4 - - name: DIAGNOSTICS - Inspect Gitea State and Variables - run: | - echo "==================================================" - echo " GITEA ACTIONS STATE INSPECTION " - echo "==================================================" - echo "needs.check.result: ${{ needs.check.result }}" - echo "needs.quality-gate.result: ${{ needs.quality-gate.result }}" - echo "job.status: ${{ job.status }}" - echo "==================================================" - - - name: Download build env - uses: actions/download-artifact@v3 - with: - name: build-context - path: /tmp/build-ctx - - # TÄMÄ STEPPI VARMISTAA LAADUN JA RÄJÄYTTÄÄ PUTKEN JOS LAATUTESTIT EIVÄT OLLEET SUCCESS - - name: Verify Quality Gate and Context - id: gatekeeper - run: | - QG_RESULT="${{ needs.quality-gate.result }}" - source /tmp/build-ctx/build.env - - echo "gitea-ci-library - Quality gate tilaksi luettu: $QG_RESULT" - echo "gitea-ci-library - Levyltä luettu ARTIFACT_EXISTS: $ARTIFACT_EXISTS" - - # 1. RÄJÄYTETÄÄN PUTKI jos testit feilasivat tai ne peruttiin - if [ "$QG_RESULT" != "success" ]; then - echo "gitea-ci-library - ERROR: Quality gate pitää läpäistä! Tila oli: $QG_RESULT" >&2 - exit 1 - fi - - # 2. Päätetään skipataanko build koska kontti on jo tehty - if [ "$ARTIFACT_EXISTS" = "true" ]; then - echo "gitea-ci-library - Kontti valmiina. Ohitetaan build-vaiheet." - echo "skip=true" >> "$GITHUB_OUTPUT" - else - echo "skip=false" >> "$GITHUB_OUTPUT" - fi - - name: Set Gitea status to PENDING - if: steps.gatekeeper.outputs.skip == 'false' run: | echo "===== gitea-ci-library - Docker Build | begin =====" bash scripts/report-status.sh pending "Building Docker image..." ci-docker-build - name: Build container - if: steps.gatekeeper.outputs.skip == 'false' + id: build + env: + VERSION: ${{ needs.check.outputs.next_version }} run: | - source /tmp/build-ctx/build.env NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ) docker build \ --label "git.commit=${{ github.sha }}" \ --label "git.commitBy=${{ github.actor }}" \ --label "build.date=${NOW}" \ - -t "minimal:${NEXT_VERSION}" . + -t "minimal:${VERSION}" . - name: Report status SUCCESS - if: steps.gatekeeper.outputs.skip == 'false' && success() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh success "Docker build $NEXT_VERSION OK" ci-docker-build + if: success() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh success "Docker build $VERSION OK" ci-docker-build - name: Report status FAILURE - if: steps.gatekeeper.outputs.skip == 'false' && failure() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh failure "Docker build $NEXT_VERSION FAILED" ci-docker-build + if: failure() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh failure "Docker build $VERSION FAILED" ci-docker-build - name: Save Docker image - if: steps.gatekeeper.outputs.skip == 'false' && success() run: | - source /tmp/build-ctx/build.env mkdir -p /tmp/image - docker save "minimal:${NEXT_VERSION}" -o /tmp/image/artifact.tar + docker save "minimal:${{ needs.check.outputs.next_version }}" -o /tmp/image/artifact.tar - name: Upload Docker image artifact - if: steps.gatekeeper.outputs.skip == 'false' && success() uses: actions/upload-artifact@v3 with: name: docker-image @@ -192,119 +147,72 @@ jobs: push: runs-on: ubuntu-latest needs: [check, build] - if: always() + if: needs.build.result == 'success' && needs.check.outputs.artifact_exists == 'false' steps: - uses: actions/checkout@v4 - - name: Download build env - uses: actions/download-artifact@v3 - with: - name: build-context - path: /tmp/build-ctx - - - name: Verify Build Status - id: gatekeeper - run: | - BUILD_RESULT="${{ needs.build.result }}" - source /tmp/build-ctx/build.env - if [ "$BUILD_RESULT" != "success" ]; then - echo "gitea-ci-library - Edellinen vaihe epäonnistui. Keskeytetään." >&2 - exit 1 - fi - if [ "${ARTIFACT_EXISTS}" = "true" ]; then - echo "skip=true" >> "$GITHUB_OUTPUT" - else - echo "skip=false" >> "$GITHUB_OUTPUT" - fi - - name: Load saved Docker image - if: steps.gatekeeper.outputs.skip == 'false' uses: actions/download-artifact@v3 with: name: docker-image path: /tmp/image - name: Set Gitea status to PENDING - if: steps.gatekeeper.outputs.skip == 'false' run: | echo "===== gitea-ci-library - Docker Push | begin =====" bash scripts/report-status.sh pending "Pushing to registry..." ci-docker-push - name: Push to Gitea Packages - if: steps.gatekeeper.outputs.skip == 'false' env: GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + VERSION: ${{ needs.check.outputs.next_version }} run: | - source /tmp/build-ctx/build.env docker load -i /tmp/image/artifact.tar REGISTRY=$(echo "${{ gitea.server_url }}" | sed -e 's|^https://||' -e 's|^http://||') - IMAGE="$REGISTRY/${{ gitea.repository }}:${NEXT_VERSION}" - docker tag "minimal:$NEXT_VERSION" "$IMAGE" + IMAGE="$REGISTRY/${{ gitea.repository }}:$VERSION" + docker tag "minimal:$VERSION" "$IMAGE" echo "$GITEA_TOKEN" | docker login "$REGISTRY" -u "${{ github.actor }}" --password-stdin docker push "$IMAGE" docker logout "$REGISTRY" - name: Report status SUCCESS - if: steps.gatekeeper.outputs.skip == 'false' && success() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh success "Docker push $NEXT_VERSION OK" ci-docker-push + if: success() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh success "Docker push $VERSION OK" ci-docker-push - name: Report status FAILURE - if: steps.gatekeeper.outputs.skip == 'false' && failure() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh failure "Docker push $NEXT_VERSION FAILED" ci-docker-push + if: failure() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh failure "Docker push $VERSION FAILED" ci-docker-push tag-commit: runs-on: ubuntu-latest needs: [check, push] - if: always() + if: needs.push.result == 'success' && needs.check.outputs.artifact_exists == 'false' steps: - uses: actions/checkout@v4 - - name: Download build env - uses: actions/download-artifact@v3 - with: - name: build-context - path: /tmp/build-ctx - - - name: Verify Push Status - id: gatekeeper - run: | - PUSH_RESULT="${{ needs.push.result }}" - source /tmp/build-ctx/build.env - if [ "$PUSH_RESULT" != "success" ]; then - echo "gitea-ci-library - Push vaihe epäonnistui. Keskeytetään." >&2 - exit 1 - fi - if [ "${ARTIFACT_EXISTS}" = "true" ]; then - echo "skip=true" >> "$GITHUB_OUTPUT" - else - echo "skip=false" >> "$GITHUB_OUTPUT" - fi - - name: Set Gitea status to PENDING - if: steps.gatekeeper.outputs.skip == 'false' run: | echo "===== gitea-ci-library - Create Tag | begin =====" bash scripts/report-status.sh pending "Creating tag..." ci-docker-tag - name: Create git tag - if: steps.gatekeeper.outputs.skip == 'false' env: GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} REPO: ${{ github.repository }} SERVER_URL: ${{ gitea.server_url }} RUN_NUMBER: ${{ github.run_number }} SHA: ${{ github.sha }} + VERSION: ${{ needs.check.outputs.next_version }} run: | - source /tmp/build-ctx/build.env HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST \ "$SERVER_URL/api/v1/repos/$REPO/tags" \ -H "Authorization: token $GITEA_TOKEN" \ -H "Content-Type: application/json" \ - -d "{\"tag_name\": \"$NEXT_VERSION\", \"message\": \"Build #$RUN_NUMBER\", \"target\": \"$SHA\"}") + -d "{\"tag_name\": \"$VERSION\", \"message\": \"Build #$RUN_NUMBER\", \"target\": \"$SHA\"}") if [ "$HTTP_CODE" = "201" ] || [ "$HTTP_CODE" = "409" ]; then exit 0 @@ -313,13 +221,13 @@ jobs: fi - name: Report status SUCCESS - if: steps.gatekeeper.outputs.skip == 'false' && success() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh success "Tag $NEXT_VERSION OK" ci-docker-tag + if: success() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh success "Tag $VERSION OK" ci-docker-tag - name: Report status FAILURE - if: steps.gatekeeper.outputs.skip == 'false' && failure() - run: | - source /tmp/build-ctx/build.env - bash scripts/report-status.sh failure "Tag $NEXT_VERSION FAILED" ci-docker-tag + if: failure() + env: + VERSION: ${{ needs.check.outputs.next_version }} + run: bash scripts/report-status.sh failure "Tag $VERSION FAILED" ci-docker-tag diff --git a/README.md b/README.md index a36e115..ed2584e 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ helm upgrade --install act-runner gitea/actions \ --set giteaRootURL="$GITEA_URL" \ --set existingSecret=act-runner-token \ --set existingSecretKey=token \ + --set statefulset.runner.tag=1.0.8 \ --set statefulset.dind.tag=29.5.2-dind \ --set-string 'statefulset.runner.config=log: level: info