From ebbd53106f0563c92ed88ce4a8284a0632af5571 Mon Sep 17 00:00:00 2001 From: AirryCo Date: Thu, 28 Nov 2024 18:12:22 +0800 Subject: [PATCH] add `--depth=1` to git clone. --- .github/workflows/build-nightly-cron.yaml | 17 +++++++---------- .github/workflows/build-release-cron.yaml | 4 +--- docker/Dockerfile | 2 +- docker/Dockerfile-fika | 6 +++--- docker/Dockerfile-nightly | 2 +- docker/Dockerfile-nightly-fika | 6 +++--- trigger.fika | 1 - trigger.nightly | 1 + 8 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 trigger.fika diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index 7eb6bf4..5cb92e9 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -58,7 +58,7 @@ jobs: - name: Compare Fika Hashes id: compare-fika run: | - source trigger.fika + source trigger.nightly fika_last_built_hash=${fika:0:8} fika_latest_commit_hash=$(git ls-remote https://github.com/project-fika/Fika-Server.git refs/heads/${{ env.NIGHTLY_BRANCH_FIKA }} | awk '{print $1}') fika_latest_commit_hash=${fika_latest_commit_hash:0:8}; @@ -97,7 +97,7 @@ jobs: build-fika-server: needs: prepare - if: needs.prepare.outputs.PROCEED == 'true' || needs.prepare.outputs.PROCEED_FIKA == 'true' + if: needs.prepare.outputs.PROCEED == 'true' runs-on: ubuntu-latest env: SOURCECODE_DIR: ${{ github.workspace }}/fika-server @@ -111,7 +111,7 @@ jobs: - name: Clone Fika Server Code run: | - git clone -b ${{ env.NIGHTLY_BRANCH_FIKA }} https://github.com/project-fika/Fika-Server.git ${{ env.SOURCECODE_DIR }} + git clone -b ${{ env.NIGHTLY_BRANCH_FIKA }} --depth=1 https://github.com/project-fika/Fika-Server.git ${{ env.SOURCECODE_DIR }} shell: bash - name: Setup Node @@ -162,7 +162,7 @@ jobs: build-server-linux: needs: [prepare, build-fika-server] - if: needs.prepare.outputs.PROCEED == 'true' || needs.prepare.outputs.PROCEED_FIKA == 'true' + if: needs.prepare.outputs.PROCEED == 'true' runs-on: ubuntu-latest env: OUTPUT_DIR: spt-server @@ -279,7 +279,6 @@ jobs: build-docker-image-multi-arch: needs: [prepare, build-server-linux] - if: needs.prepare.outputs.PROCEED == 'true' || needs.prepare.outputs.PROCEED_FIKA == 'true' runs-on: ubuntu-latest env: DOCKERHUB_USER: stblog @@ -374,7 +373,6 @@ jobs: build-server-windows: needs: [prepare, build-server-linux] - if: needs.prepare.outputs.PROCEED == 'true' || needs.prepare.outputs.PROCEED_FIKA == 'true' runs-on: windows-latest env: OUTPUT_DIR: spt-server @@ -392,7 +390,7 @@ jobs: - name: Clone AirryCo's Server Code run: | - git clone -b ${{ env.NIGHTLY_BRANCH }} ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} + git clone -b ${{ env.NIGHTLY_BRANCH }} --depth=1 ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }} git lfs pull shell: bash @@ -489,10 +487,9 @@ jobs: rm trigger.nightly server=${{ needs.prepare.outputs.SPT_SERVER_COMMIT }} echo "server=$server" > trigger.nightly - rm trigger.fika fika=${{ needs.prepare.outputs.FIKA_SERVER_COMMIT }} - echo "fika=$fika" > trigger.fika - git add trigger.nightly trigger.fika + echo "fika=$fika" >> trigger.nightly + git add trigger.nightly git commit -m "🤖 up to spt-server: \`$server\`, fika-server:\`${fika:0:8}\`." git push shell: bash diff --git a/.github/workflows/build-release-cron.yaml b/.github/workflows/build-release-cron.yaml index 24f6606..f2c6de4 100644 --- a/.github/workflows/build-release-cron.yaml +++ b/.github/workflows/build-release-cron.yaml @@ -221,7 +221,6 @@ jobs: build-docker-image-multi-arch: needs: [prepare, build-server-linux] - if: needs.prepare.outputs.PROCEED == 'true' || needs.prepare.outputs.PROCEED_FIKA == 'true' runs-on: ubuntu-latest env: DOCKERHUB_USER: stblog @@ -369,7 +368,6 @@ jobs: build-server-windows: needs: [prepare, build-server-linux] - if: ${{ needs.prepare.outputs.PROCEED == 'true' }} runs-on: windows-latest env: OUTPUT_DIR: spt-server @@ -386,7 +384,7 @@ jobs: - name: Clone AirroCo's Server Code run: | - git clone -b ${{ env.RELEASE_BRANCH }} ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} + git clone -b ${{ env.RELEASE_BRANCH }} --depth=1 ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }} git lfs pull shell: bash diff --git a/docker/Dockerfile b/docker/Dockerfile index 4cc7041..2d41090 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM node:20.11.1-alpine AS server-builder RUN apk add --no-cache git git-lfs && \ - git clone -b master https://github.com/AirryCo/spt-server.git /spt-server && \ + git clone -b master --depth=1 https://github.com/AirryCo/spt-server.git /spt-server && \ cd /spt-server && git lfs pull && \ cd project && \ npm install && npm run build:release diff --git a/docker/Dockerfile-fika b/docker/Dockerfile-fika index cc3f7af..ba9c2de 100644 --- a/docker/Dockerfile-fika +++ b/docker/Dockerfile-fika @@ -1,13 +1,13 @@ FROM node:20.11.1-alpine AS fika-builder -RUN apk add --no-cache git git-lfs unzip && \ - git clone -b main https://github.com/project-fika/Fika-Server.git /fika-server && \ +RUN apk add --no-cache git unzip && \ + git clone -b main --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ cd /fika-server && \ npm install && npm run build && \ mkdir output && cd output && unzip /fika-server/dist/fika-server.zip FROM node:20.11.1-alpine AS server-builder RUN apk add --no-cache git git-lfs && \ - git clone -b 3.10.0-DEV https://github.com/AirryCo/spt-server.git /spt-server && \ + git clone -b 3.10.0-DEV --depth=1 https://github.com/AirryCo/spt-server.git /spt-server && \ cd /spt-server && git lfs pull && \ cd project && \ npm install && npm run build:release diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly index e717afd..69205ab 100644 --- a/docker/Dockerfile-nightly +++ b/docker/Dockerfile-nightly @@ -1,6 +1,6 @@ FROM node:20.11.1-alpine AS server-builder RUN apk add --no-cache git git-lfs && \ - git clone -b 3.10.0-DEV https://github.com/AirryCo/spt-server.git /spt-server && \ + git clone -b 3.10.0-DEV --depth=1 https://github.com/AirryCo/spt-server.git /spt-server && \ cd /spt-server && git lfs pull && \ cd project && \ npm install && npm run build:release diff --git a/docker/Dockerfile-nightly-fika b/docker/Dockerfile-nightly-fika index 2296c5c..1434deb 100644 --- a/docker/Dockerfile-nightly-fika +++ b/docker/Dockerfile-nightly-fika @@ -1,13 +1,13 @@ FROM node:20.11.1-alpine AS fika-builder -RUN apk add --no-cache git git-lfs unzip && \ - git clone -b spt-3.10 https://github.com/project-fika/Fika-Server.git /fika-server && \ +RUN apk add --no-cache git unzip && \ + git clone -b spt-3.10 --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ cd /fika-server && \ npm install && npm run build && \ mkdir output && cd output && unzip /fika-server/dist/fika-server.zip FROM node:20.11.1-alpine AS server-builder RUN apk add --no-cache git git-lfs && \ - git clone -b 3.10.0-DEV https://github.com/AirryCo/spt-server.git /spt-server && \ + git clone -b 3.10.0-DEV --depth=1 https://github.com/AirryCo/spt-server.git /spt-server && \ cd /spt-server && git lfs pull && \ cd project && \ npm install && npm run build:release diff --git a/trigger.fika b/trigger.fika deleted file mode 100644 index d39de2f..0000000 --- a/trigger.fika +++ /dev/null @@ -1 +0,0 @@ -fika=a82cdc8b diff --git a/trigger.nightly b/trigger.nightly index 3c5ed73..d9c3899 100644 --- a/trigger.nightly +++ b/trigger.nightly @@ -1 +1,2 @@ server=058ed22f +fika=a82cdc8b