yhl452493373/spt-server-ci
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

lfs server fixed.

Browse Source
This commit is contained in:
AirryCo
2025-01-11 14:24:08 +08:00
parent 8f4aa40bff
commit cc4698aab2
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build-nightly-cron.yaml vendored
View File

@@ -201,7 +201,7 @@ jobs:
- name: Merge Server Code From SPT - name: Merge Server Code From SPT
id: merge id: merge
run: | run: |
git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@git.962525.xyz:2096/henry/spt-server.git/info/lfs git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@${{ secrets.GITEA_URL }}/henry/spt-server.git/info/lfs
git lfs pull git lfs pull
git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ needs.prepare.outputs.NIGHTLY_BRANCH_SPT }}:SPT-${{ env.NIGHTLY_BRANCH }} git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ needs.prepare.outputs.NIGHTLY_BRANCH_SPT }}:SPT-${{ env.NIGHTLY_BRANCH }}
git merge -m "🤖 Merge branch '${{ env.NIGHTLY_BRANCH }}' from SPT" --no-ff SPT-${{ env.NIGHTLY_BRANCH }} git merge -m "🤖 Merge branch '${{ env.NIGHTLY_BRANCH }}' from SPT" --no-ff SPT-${{ env.NIGHTLY_BRANCH }}
@@ -273,7 +273,7 @@ jobs:
git pull git pull
REMOTE_URL="https://AirryCo:${{ secrets.AIRRYCO_TOKEN }}@github.com/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}.git" REMOTE_URL="https://AirryCo:${{ secrets.AIRRYCO_TOKEN }}@github.com/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}.git"
git remote set-url origin "$REMOTE_URL" git remote set-url origin "$REMOTE_URL"
git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@git.962525.xyz:2096/henry/spt-server.git/info/lfs git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@${{ secrets.GITEA_URL }}/henry/spt-server.git/info/lfs
git push -u origin ${{ env.NIGHTLY_BRANCH }} git push -u origin ${{ env.NIGHTLY_BRANCH }}
shell: bash shell: bash
@@ -353,7 +353,8 @@ jobs:
file: ./docker/Dockerfile-nightly file: ./docker/Dockerfile-nightly
push: true push: true
build-args: | build-args: |
SECRET_KEY=${{ secrets.GITEA_PUSH_TOKEN }} GITEA_TOKEN=${{ secrets.GITEA_PUSH_TOKEN }}
GITEA_URL=${{ secrets.GITEA_URL }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: | labels: |
${{ steps.meta.outputs.labels }} ${{ steps.meta.outputs.labels }}
@@ -369,7 +370,8 @@ jobs:
file: ./docker/Dockerfile-nightly-fika file: ./docker/Dockerfile-nightly-fika
push: true push: true
build-args: | build-args: |
SECRET_KEY=${{ secrets.GITEA_PUSH_TOKEN }} GITEA_TOKEN=${{ secrets.GITEA_PUSH_TOKEN }}
GITEA_URL=${{ secrets.GITEA_URL }}
tags: ${{ steps.meta-fika.outputs.tags }} tags: ${{ steps.meta-fika.outputs.tags }}
labels: | labels: |
${{ steps.meta-fika.outputs.labels }} ${{ steps.meta-fika.outputs.labels }}
@@ -456,7 +458,7 @@ jobs:
id: build-server id: build-server
run: | run: |
cd ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }}
git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@git.962525.xyz:2096/henry/spt-server.git/info/lfs git config -f .lfsconfig lfs.url https://${{ secrets.GITEA_PUSH_TOKEN }}:@${{ secrets.GITEA_URL }}/henry/spt-server.git/info/lfs
git lfs pull git lfs pull
cd project cd project
npm run build:release npm run build:release

2
docker/Dockerfile-nightly
View File

@@ -1,7 +1,7 @@
FROM node:20.11.1-bullseye AS server-builder FROM node:20.11.1-bullseye AS server-builder
RUN apt update && apt install -y git git-lfs p7zip-full && \ RUN apt update && apt install -y git git-lfs p7zip-full && \
GIT_LFS_SKIP_SMUDGE=1 git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ GIT_LFS_SKIP_SMUDGE=1 git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \
cd /snapshot && git config -f .lfsconfig lfs.url https://$SECRET_KEY:@git.962525.xyz:2096/henry/spt-server.git/info/lfs && git lfs pull && \ cd /snapshot && git config -f .lfsconfig lfs.url https://$GITEA_TOKEN:@$GITEA_URL/henry/spt-server.git/info/lfs && git lfs pull && \
cd project && \ cd project && \
npm install && npm run build:release && \ npm install && npm run build:release && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

2
docker/Dockerfile-nightly-fika
View File

@@ -8,7 +8,7 @@ RUN apk add --no-cache git unzip && \
FROM node:22.12.0-bullseye AS server-builder FROM node:22.12.0-bullseye AS server-builder
RUN apt update && apt install -y git git-lfs p7zip-full && \ RUN apt update && apt install -y git git-lfs p7zip-full && \
GIT_LFS_SKIP_SMUDGE=1 git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ GIT_LFS_SKIP_SMUDGE=1 git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \
cd /snapshot && git config -f .lfsconfig lfs.url https://$SECRET_KEY:@git.962525.xyz:2096/henry/spt-server.git/info/lfs && git lfs pull && \ cd /snapshot && git config -f .lfsconfig lfs.url https://$GITEA_TOKEN:@$GITEA_URL/henry/spt-server.git/info/lfs && git lfs pull && \
cd project && \ cd project && \
npm install && npm run build:release && \ npm install && npm run build:release && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*