diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index c6bc338..33445aa 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -201,7 +201,7 @@ jobs: - name: Merge Server Code From SPT id: merge 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 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 }} @@ -273,7 +273,7 @@ jobs: git pull REMOTE_URL="https://AirryCo:${{ secrets.AIRRYCO_TOKEN }}@github.com/${{ env.REPOSITORY_SPT_SERVER_AIRRYCO }}.git" 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 }} shell: bash @@ -353,7 +353,8 @@ jobs: file: ./docker/Dockerfile-nightly push: true build-args: | - SECRET_KEY=${{ secrets.GITEA_PUSH_TOKEN }} + GITEA_TOKEN=${{ secrets.GITEA_PUSH_TOKEN }} + GITEA_URL=${{ secrets.GITEA_URL }} tags: ${{ steps.meta.outputs.tags }} labels: | ${{ steps.meta.outputs.labels }} @@ -369,7 +370,8 @@ jobs: file: ./docker/Dockerfile-nightly-fika push: true 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 }} labels: | ${{ steps.meta-fika.outputs.labels }} @@ -456,7 +458,7 @@ jobs: id: build-server run: | 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 cd project npm run build:release diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly index d8410f1..2db2c33 100644 --- a/docker/Dockerfile-nightly +++ b/docker/Dockerfile-nightly @@ -1,7 +1,7 @@ FROM node:20.11.1-bullseye AS server-builder 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 && \ - 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 && \ npm install && npm run build:release && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile-nightly-fika b/docker/Dockerfile-nightly-fika index 674f9f3..c32fbb5 100644 --- a/docker/Dockerfile-nightly-fika +++ b/docker/Dockerfile-nightly-fika @@ -8,7 +8,7 @@ RUN apk add --no-cache git unzip && \ FROM node:22.12.0-bullseye AS server-builder 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 && \ - 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 && \ npm install && npm run build:release && \ rm -rf /var/lib/apt/lists/*