diff --git a/.github/scripts/commit-repo.sh b/.github/scripts/commit-repo.sh index ab6163b8..4a236a3a 100755 --- a/.github/scripts/commit-repo.sh +++ b/.github/scripts/commit-repo.sh @@ -1,7 +1,16 @@ #!/bin/bash set -e -rsync -a --delete --exclude .git --exclude .gitignore ../master/repo/ . +cp ../master/repo/server-r* . +new_build=$(ls | tail -1) +diff $new_build server-latest.jar > /dev/null +if [ "$?" -ne 0 ]; then # same file? + rm $new_build +else + cp -f $new_build server-latest.jar +fi + + git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" git status diff --git a/.github/scripts/create-repo.sh b/.github/scripts/create-repo.sh index 984bdac5..fc78e9b0 100755 --- a/.github/scripts/create-repo.sh +++ b/.github/scripts/create-repo.sh @@ -3,7 +3,6 @@ set -e mkdir -p repo/ -revision=$(git rev-list HEAD --count) +revision=$(git rev-list master --count) -cp server/build/server-1.0-all.jar "repo/server-r$revision.jar" -cp -f server/build/server-1.0-all.jar "repo/server-latest.jar" \ No newline at end of file +cp server/build/server-1.0-all.jar "repo/server-r$revision.jar" \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e47e350..040cea31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: with: ref: master path: master + fetch-depth: 0 - name: Set up JDK 1.8 uses: actions/setup-java@v1