From 860268fb9cbe0ace06f75f3079b1b8cbcdbeb716 Mon Sep 17 00:00:00 2001 From: AirryCo Date: Tue, 18 Mar 2025 18:13:19 +0800 Subject: [PATCH] branch name fixed. --- .github/workflows/build-nightly-cron.yaml | 2 +- .github/workflows/build-nightly-manual.yaml | 2 +- .github/workflows/build-release-cron.yaml | 2 +- .github/workflows/build-release-manual.yaml | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index cce79fd..b0bb529 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -35,7 +35,7 @@ jobs: - name: Get Latest Commit From SPT id: get-latest-commit run: | - branch_name=$(git ls-remote --heads https://github.com/sp-tarkov/server.git | grep -o 'refs/heads/3.11.0-dev' | sed 's|refs/heads/||' | head -n 1) + branch_name=$(git ls-remote --heads https://github.com/sp-tarkov/server.git | grep -o 'refs/heads/3.11.x-dev' | sed 's|refs/heads/||' | head -n 1) SPT_SERVER_LATEST_COMMIT_HASH=$(git ls-remote ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git refs/heads/$branch_name | awk '{print $1}') SPT_SERVER_LATEST_COMMIT_HASH=${SPT_SERVER_LATEST_COMMIT_HASH:0:8} echo "👽 NIGHTLY_BRANCH_SPT = $branch_name" diff --git a/.github/workflows/build-nightly-manual.yaml b/.github/workflows/build-nightly-manual.yaml index 47e342c..ba78e5c 100644 --- a/.github/workflows/build-nightly-manual.yaml +++ b/.github/workflows/build-nightly-manual.yaml @@ -9,7 +9,7 @@ env: SERVER_URL: https://dev.sp-tarkov.com REPOSITORY_SERVER: SPT/Server REPOSITORY_SERVER_MEDUSA: medusa/spt-server - NIGHTLY_BRANCH: 3.10.0-DEV + NIGHTLY_BRANCH: 3.11.x-DEV jobs: prepare: diff --git a/.github/workflows/build-release-cron.yaml b/.github/workflows/build-release-cron.yaml index e39dfd1..7e62db3 100644 --- a/.github/workflows/build-release-cron.yaml +++ b/.github/workflows/build-release-cron.yaml @@ -455,7 +455,7 @@ jobs: - name: Download Fika-Server run: | - wget https://github.com/project-fika/Fika-Server/releases/download/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}/fika-server.zip + wget https://github.com/project-fika/Fika-Server/releases/download/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}/fika-server-$(echo ${{ needs.prepare.outputs.TARGET_TAG_FIKA }} | cut -c2-).zip - name: Compress Releases id: compress-release diff --git a/.github/workflows/build-release-manual.yaml b/.github/workflows/build-release-manual.yaml index 90e803c..2c6c1f5 100644 --- a/.github/workflows/build-release-manual.yaml +++ b/.github/workflows/build-release-manual.yaml @@ -125,7 +125,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: 20.11.1 + node-version: 22.12.0 - name: Runner Debug Information id: debug-info @@ -200,7 +200,7 @@ jobs: # docker - name: Extract metadata for Docker with release version - if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} id: meta uses: docker/metadata-action@v5 with: @@ -213,7 +213,7 @@ jobs: type=semver,pattern={{major}}.{{minor}},value=${{ needs.prepare.outputs.TARGET_TAG }} type=raw,value=latest - name: Extract metadata for Docker with release version and fika built-in - if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} id: meta-fika uses: docker/metadata-action@v5 with: @@ -226,7 +226,7 @@ jobs: type=semver,pattern={{major}}.{{minor}}-fika,value=${{ needs.prepare.outputs.TARGET_TAG }} type=raw,value=latest-fika - name: Extract metadata for Docker with bem version - if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} id: meta-bem uses: docker/metadata-action@v5 with: @@ -238,7 +238,7 @@ jobs: type=semver,pattern={{version}},value=${{ needs.prepare.outputs.TARGET_TAG }} type=semver,pattern={{major}}.{{minor}},value=${{ needs.prepare.outputs.TARGET_TAG }} - name: Extract metadata for Docker with bem version and fika built-in - if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} id: meta-bem-fika uses: docker/metadata-action@v5 with: @@ -277,7 +277,7 @@ jobs: password: ${{ secrets.ALIYUN_REGISTRY_TOKEN }} - name: Build and Push For Release With Fika - if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} uses: docker/build-push-action@v6 with: context: ./docker @@ -291,7 +291,7 @@ jobs: org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }} platforms: linux/amd64,linux/arm64 - name: Build and Push For Release - if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ !contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} uses: docker/build-push-action@v6 with: context: ./docker @@ -306,7 +306,7 @@ jobs: platforms: linux/amd64,linux/arm64 - name: Build and Push For BEM With Fika - if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} uses: docker/build-push-action@v6 with: context: ./docker @@ -320,7 +320,7 @@ jobs: org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }} platforms: linux/amd64,linux/arm64 - name: Build and Push For BEM - if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BEM') }} + if: ${{ contains(needs.prepare.outputs.TARGET_TAG, 'BE') }} uses: docker/build-push-action@v6 with: context: ./docker @@ -455,7 +455,7 @@ jobs: - name: Download Fika-Server run: | - wget https://github.com/project-fika/Fika-Server/releases/download/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}/fika-server.zip + wget https://github.com/project-fika/Fika-Server/releases/download/${{ needs.prepare.outputs.TARGET_TAG_FIKA }}/fika-server-$(echo ${{ needs.prepare.outputs.TARGET_TAG_FIKA }} | cut -c2-).zip - name: Compress Releases id: compress-release