diff --git a/.github/workflows/build-release-manual.yaml b/.github/workflows/build-release-manual.yaml index 2a03897..1412b93 100644 --- a/.github/workflows/build-release-manual.yaml +++ b/.github/workflows/build-release-manual.yaml @@ -9,8 +9,6 @@ env: SERVER_URL: https://github.com REPOSITORY_SPT_SERVER: sp-tarkov/server REPOSITORY_SPT_SERVER_AIRRYCO: AirryCo/spt-server - RELEASE_BRANCH: master - RELEASE_BRANCH_FIKA: main jobs: prepare: @@ -32,8 +30,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Get Latest Tag From SPT id: get-latest-tag run: | @@ -357,7 +353,7 @@ jobs: - name: Clone AirroCo's Server Code run: | - git clone -b ${{ env.RELEASE_BRANCH }} --depth=1 ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} + git clone -b ${{ github.ref_name }} --depth=1 ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }} ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }} git lfs pull shell: bash @@ -457,9 +453,12 @@ jobs: rm trigger.release echo "server=${{ needs.prepare.outputs.TARGET_TAG }}" > trigger.release echo "fika=${{ needs.prepare.outputs.TARGET_TAG_FIKA }}" >> trigger.release - git add trigger.release - git commit -m "🤖 bump to \`${{ needs.prepare.outputs.TARGET_TAG }}\`." - git push + changes=$(git status --porcelain) + if [ -n "$changes" ]; then + git add trigger.release + git commit -m "🤖 bump to \`${{ needs.prepare.outputs.TARGET_TAG }}\`." + git push + fi shell: bash - name: Download Windows Artifact @@ -511,9 +510,9 @@ jobs: Tarkov: ***${{ needs.prepare.outputs.EFT_VERSION }}*** - [SPT/Server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}) commit hash: [${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}/src/commit/${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}), commit time: **${{ needs.prepare.outputs.SPT_SERVER_COMMIT_TIME }}** + [SPT/Server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}) commit hash: [${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}/tree/${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}), commit time: **${{ needs.prepare.outputs.SPT_SERVER_COMMIT_TIME }}** - [AirryCo/spt-server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}) commit: [${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}/src/commit/${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}) + [AirryCo/spt-server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}) commit: [${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}/tree/${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}) Fika-Server: [${{ needs.prepare.outputs.TARGET_TAG_FIKA }}](https://github.com/project-fika/Fika-Server/tree/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}) @@ -560,9 +559,9 @@ jobs: Tarkov: ***${{ needs.prepare.outputs.EFT_VERSION }}*** - [SPT/Server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}) commit hash: [${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}/src/commit/${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}), commit time: **${{ needs.prepare.outputs.SPT_SERVER_COMMIT_TIME }}** + [SPT/Server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}) commit hash: [${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}/tree/${{ needs.prepare.outputs.SPT_SERVER_COMMIT }}), commit time: **${{ needs.prepare.outputs.SPT_SERVER_COMMIT_TIME }}** - [AirryCo/spt-server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}) commit: [${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}/src/commit/${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}) + [AirryCo/spt-server](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}) commit: [${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}](${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}/tree/${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID }}) Fika-Server: [${{ needs.prepare.outputs.TARGET_TAG_FIKA }}](https://github.com/project-fika/Fika-Server/tree/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}) diff --git a/docker/Dockerfile-manual b/docker/Dockerfile-manual index e3a59b7..5b9dca1 100644 --- a/docker/Dockerfile-manual +++ b/docker/Dockerfile-manual @@ -3,17 +3,11 @@ RUN apt update && apt install -y git git-lfs p7zip-full && \ git clone -b 3.10.5 --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ cd /snapshot && git lfs pull && \ cd project && \ - npm config set registry https://registry.npmmirror.com && npm install && npm run build:release && \ + npm install && npm run build:release && \ rm -rf /var/lib/apt/lists/* FROM debian:bookworm-slim LABEL author="AirryCo " -LABEL org.opencontainers.image.description="Single Player Tarkov(SPT) - Server Building Project" -LABEL org.opencontainers.image.revision="f06b54f1776c1c3e3c257120a3a60c478feda2e1" -LABEL org.opencontainers.image.source="https://github.com/AirryCo/spt-server" -LABEL org.opencontainers.image.title="spt-server" -LABEL org.opencontainers.image.url="https://github.com/AirryCo/spt-server" -LABEL org.opencontainers.image.version="3.10.5" ENV TZ=Asia/Shanghai COPY --from=server-builder /snapshot/project/build/ /app/spt-server/ VOLUME /opt/spt-server diff --git a/docker/Dockerfile-manual-fika b/docker/Dockerfile-manual-fika index d19a7b7..e849c77 100644 --- a/docker/Dockerfile-manual-fika +++ b/docker/Dockerfile-manual-fika @@ -1,8 +1,8 @@ FROM node:20.11.1-alpine AS fika-builder RUN apk add --no-cache git unzip && \ - git clone -b main --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ + git clone -b 2.3.6 --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ cd /fika-server && \ - npm config set registry https://registry.npmmirror.com && npm install && npm run build && \ + npm install && npm run build && \ mkdir output && cd output && unzip /fika-server/dist/*.zip FROM node:20.11.1-bullseye AS server-builder @@ -10,17 +10,11 @@ RUN apt update && apt install -y git git-lfs p7zip-full && \ git clone -b 3.10.5 --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ cd /snapshot && git lfs pull && \ cd project && \ - npm config set registry https://registry.npmmirror.com && npm install && npm run build:release && \ + npm install && npm run build:release && \ rm -rf /var/lib/apt/lists/* FROM debian:bookworm-slim LABEL author="AirryCo " -LABEL org.opencontainers.image.description="Single Player Tarkov(SPT) - Server Building Project" -LABEL org.opencontainers.image.revision="f06b54f1776c1c3e3c257120a3a60c478feda2e1" -LABEL org.opencontainers.image.source="https://github.com/AirryCo/spt-server" -LABEL org.opencontainers.image.title="spt-server" -LABEL org.opencontainers.image.url="https://github.com/AirryCo/spt-server" -LABEL org.opencontainers.image.version="3.10.5" ENV TZ=Asia/Shanghai COPY --from=server-builder /snapshot/project/build/ /app/spt-server/ COPY --from=fika-builder /fika-server/output/ /app/spt-server/