diff --git a/.cache/debian-base.digest b/.cache/debian-base.digest deleted file mode 100644 index 2b426b0..0000000 --- a/.cache/debian-base.digest +++ /dev/null @@ -1 +0,0 @@ -gitea.fithwum.tech/fithwum/debian-base@sha256:4023732c1234033dd440901f801b44288d6acd1c2d9db5918b104028dbfbc31a diff --git a/.gitea/workflows/vintage-story-build-server.yml b/.gitea/workflows/vintage-story-build-server.yml index 1e695a0..e0445cd 100644 --- a/.gitea/workflows/vintage-story-build-server.yml +++ b/.gitea/workflows/vintage-story-build-server.yml @@ -38,11 +38,10 @@ jobs: echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..." docker image prune -a -f || true - poll-debian-base-and-detect-changes: + poll-and-detect-changes: runs-on: vm-docker-build2 needs: docker-prune outputs: - digest_changed: ${{ steps.compare_digest.outputs.changed }} versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }} new_versions: ${{ steps.check_new_versions.outputs.new_versions }} steps: @@ -51,57 +50,9 @@ jobs: with: fetch-depth: 0 - - name: Ensure .cache exists - run: mkdir -p .cache && touch .cache/.gitkeep - - name: Log in to Gitea Registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: Get current digest of debian-base image - id: get_digest - run: | - IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}" - docker pull "$IMAGE" > /dev/null - DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE") - echo "digest=$DIGEST" >> $GITHUB_OUTPUT - echo "$DIGEST" > .cache/debian-base.digest.new - - - name: Compare with stored digest - id: compare_digest - run: | - CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}" - LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')" - - if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then - echo "[INFO] Digest unchanged" - echo "changed=false" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "[INFO] Digest changed → updating cache" - echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }} - - git config user.name "${{ secrets.GIT_USERNAME }}" - git config user.email "${{ secrets.GIT_EMAIL }}" - - git add ${{ env.DIGEST_FILE }} - git commit -m "Update base digest to $CURRENT_DIGEST" || true - - # --- Safe rebase with auto conflict resolution --- - git fetch origin main - if ! git rebase --strategy-option=theirs origin/main; then - echo "[WARN] Rebase conflict, auto-resolving by preferring local digest" - git rebase --abort - git fetch origin main - git reset --hard origin/main - echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }} - git add ${{ env.DIGEST_FILE }} - git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)" - fi - - git push origin HEAD:main - echo "changed=true" >> $GITHUB_OUTPUT - - name: Detect changed vintage-story versions id: check_changed_versions run: | @@ -137,11 +88,10 @@ jobs: runs-on: vm-docker-build2 needs: - docker-prune - - poll-debian-base-and-detect-changes + - poll-and-detect-changes if: | - needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' || - needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' || - needs.poll-debian-base-and-detect-changes.outputs.new_versions != '' + needs.poll-and-detect-changes.outputs.versions_changed != '' || + needs.poll-and-detect-changes.outputs.new_versions != '' strategy: matrix: version: [latest] diff --git a/.gitea/workflows/vintage-story-build-testing.yml b/.gitea/workflows/vintage-story-build-testing.yml index 22b192c..82d6463 100644 --- a/.gitea/workflows/vintage-story-build-testing.yml +++ b/.gitea/workflows/vintage-story-build-testing.yml @@ -38,11 +38,10 @@ jobs: echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..." docker image prune -a -f || true - poll-debian-base-and-detect-changes: + poll-and-detect-changes: runs-on: vm-docker-build2 needs: docker-prune outputs: - digest_changed: ${{ steps.compare_digest.outputs.changed }} versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }} new_versions: ${{ steps.check_new_versions.outputs.new_versions }} steps: @@ -51,57 +50,9 @@ jobs: with: fetch-depth: 0 - - name: Ensure .cache exists - run: mkdir -p .cache && touch .cache/.gitkeep - - name: Log in to Gitea Registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: Get current digest of debian-base image - id: get_digest - run: | - IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}" - docker pull "$IMAGE" > /dev/null - DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE") - echo "digest=$DIGEST" >> $GITHUB_OUTPUT - echo "$DIGEST" > .cache/debian-base.digest.new - - - name: Compare with stored digest - id: compare_digest - run: | - CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}" - LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')" - - if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then - echo "[INFO] Digest unchanged" - echo "changed=false" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "[INFO] Digest changed → updating cache" - echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }} - - git config user.name "${{ secrets.GIT_USERNAME }}" - git config user.email "${{ secrets.GIT_EMAIL }}" - - git add ${{ env.DIGEST_FILE }} - git commit -m "Update base digest to $CURRENT_DIGEST" || true - - # --- Safe rebase with auto conflict resolution --- - git fetch origin main - if ! git rebase --strategy-option=theirs origin/main; then - echo "[WARN] Rebase conflict, auto-resolving by preferring local digest" - git rebase --abort - git fetch origin main - git reset --hard origin/main - echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }} - git add ${{ env.DIGEST_FILE }} - git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)" - fi - - git push origin HEAD:main - echo "changed=true" >> $GITHUB_OUTPUT - - name: Detect changed vintage-story versions id: check_changed_versions run: | @@ -137,11 +88,10 @@ jobs: runs-on: vm-docker-build2 needs: - docker-prune - - poll-debian-base-and-detect-changes + - poll-and-detect-changes if: | - needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' || - needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' || - needs.poll-debian-base-and-detect-changes.outputs.new_versions != '' + needs.poll-and-detect-changes.outputs.versions_changed != '' || + needs.poll-and-detect-changes.outputs.new_versions != '' strategy: matrix: version: [testing]