From 4b7fdf59fe0265daceaf5e50009c55326eef845b Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 28 Jul 2026 18:55:31 -0700 Subject: [PATCH] updates --- .../workflows/vintage-story-build-server.yml | 53 +------------------ .../workflows/vintage-story-build-testing.yml | 53 +------------------ 2 files changed, 2 insertions(+), 104 deletions(-) diff --git a/.gitea/workflows/vintage-story-build-server.yml b/.gitea/workflows/vintage-story-build-server.yml index e0445cd..7f9c2f9 100644 --- a/.gitea/workflows/vintage-story-build-server.yml +++ b/.gitea/workflows/vintage-story-build-server.yml @@ -38,60 +38,9 @@ jobs: echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..." docker image prune -a -f || true - poll-and-detect-changes: - runs-on: vm-docker-build2 - needs: docker-prune - outputs: - versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }} - new_versions: ${{ steps.check_new_versions.outputs.new_versions }} - steps: - - name: Checkout repo - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Log in to Gitea Registry - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - - name: Detect changed vintage-story versions - id: check_changed_versions - run: | - BEFORE_COMMIT="${{ github.event.before }}" - if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then - BEFORE_COMMIT=$(git rev-parse HEAD~1) - fi - CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true) - CHANGED_VERSIONS="" - for version in $VERSIONS; do - echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version" - done - CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace - echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT - - - name: Detect vintage-story versions without build-info - id: check_new_versions - run: | - NEW_VERSIONS="" - GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}" - git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo - - for version in $VERSIONS; do - if [ ! -f "upload-repo/$version/build-info.json" ]; then - echo "[INFO] No build-info.json for $version → treating as new" - NEW_VERSIONS="$NEW_VERSIONS $version" - fi - done - - echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT - build-vintage-story-images: runs-on: vm-docker-build2 - needs: - - docker-prune - - poll-and-detect-changes - if: | - needs.poll-and-detect-changes.outputs.versions_changed != '' || - needs.poll-and-detect-changes.outputs.new_versions != '' + needs: docker-prune strategy: matrix: version: [latest] diff --git a/.gitea/workflows/vintage-story-build-testing.yml b/.gitea/workflows/vintage-story-build-testing.yml index 82d6463..f26e09f 100644 --- a/.gitea/workflows/vintage-story-build-testing.yml +++ b/.gitea/workflows/vintage-story-build-testing.yml @@ -38,60 +38,9 @@ jobs: echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..." docker image prune -a -f || true - poll-and-detect-changes: - runs-on: vm-docker-build2 - needs: docker-prune - outputs: - versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }} - new_versions: ${{ steps.check_new_versions.outputs.new_versions }} - steps: - - name: Checkout repo - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Log in to Gitea Registry - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - - name: Detect changed vintage-story versions - id: check_changed_versions - run: | - BEFORE_COMMIT="${{ github.event.before }}" - if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then - BEFORE_COMMIT=$(git rev-parse HEAD~1) - fi - CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true) - CHANGED_VERSIONS="" - for version in $VERSIONS; do - echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version" - done - CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace - echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT - - - name: Detect vintage-story versions without build-info - id: check_new_versions - run: | - NEW_VERSIONS="" - GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}" - git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo - - for version in $VERSIONS; do - if [ ! -f "upload-repo/$version/build-info.json" ]; then - echo "[INFO] No build-info.json for $version → treating as new" - NEW_VERSIONS="$NEW_VERSIONS $version" - fi - done - - echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT - build-vintage-story-images: runs-on: vm-docker-build2 - needs: - - docker-prune - - poll-and-detect-changes - if: | - needs.poll-and-detect-changes.outputs.versions_changed != '' || - needs.poll-and-detect-changes.outputs.new_versions != '' + needs: docker-prune strategy: matrix: version: [testing]