From 857cba02f1698bfd14642fe1ca29057f0a2c31cb Mon Sep 17 00:00:00 2001 From: KagurazakaNyaa Date: Thu, 14 Nov 2024 10:14:02 +0800 Subject: [PATCH] update autobuild --- .github/workflows/build.yml | 14 +++++++++----- docker-compose.yml | 2 -- update.sh | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 269922c..3c65481 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,9 +9,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Set env - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -21,9 +18,16 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: kagurazakanyaa/palworld + - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: true - tags: kagurazakanyaa/palworld:${{ env.RELEASE_VERSION }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/docker-compose.yml b/docker-compose.yml index c8a7823..bda0458 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: dedicated-server: image: kagurazakanyaa/palworld:latest diff --git a/update.sh b/update.sh index 2d12b5a..8d1a594 100755 --- a/update.sh +++ b/update.sh @@ -5,6 +5,9 @@ echo "currentversion:$currentversion version:$version" if [[ -z "${version}" ]]; then exit fi +if ! [[ $version =~ ^[0-9]+$ ]]; then + exit +fi echo "$version" >currentversion if [[ "$currentversion" == "$version" ]]; then exit