branch name fixed.
This commit is contained in:
2
.github/workflows/build-nightly-cron.yaml
vendored
2
.github/workflows/build-nightly-cron.yaml
vendored
@@ -35,7 +35,7 @@ jobs:
|
|||||||
- name: Get Latest Commit From SPT
|
- name: Get Latest Commit From SPT
|
||||||
id: get-latest-commit
|
id: get-latest-commit
|
||||||
run: |
|
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=$(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}
|
SPT_SERVER_LATEST_COMMIT_HASH=${SPT_SERVER_LATEST_COMMIT_HASH:0:8}
|
||||||
echo "👽 NIGHTLY_BRANCH_SPT = $branch_name"
|
echo "👽 NIGHTLY_BRANCH_SPT = $branch_name"
|
||||||
|
|||||||
2
.github/workflows/build-nightly-manual.yaml
vendored
2
.github/workflows/build-nightly-manual.yaml
vendored
@@ -9,7 +9,7 @@ env:
|
|||||||
SERVER_URL: https://dev.sp-tarkov.com
|
SERVER_URL: https://dev.sp-tarkov.com
|
||||||
REPOSITORY_SERVER: SPT/Server
|
REPOSITORY_SERVER: SPT/Server
|
||||||
REPOSITORY_SERVER_MEDUSA: medusa/spt-server
|
REPOSITORY_SERVER_MEDUSA: medusa/spt-server
|
||||||
NIGHTLY_BRANCH: 3.10.0-DEV
|
NIGHTLY_BRANCH: 3.11.x-DEV
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prepare:
|
prepare:
|
||||||
|
|||||||
2
.github/workflows/build-release-cron.yaml
vendored
2
.github/workflows/build-release-cron.yaml
vendored
@@ -455,7 +455,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Download Fika-Server
|
- name: Download Fika-Server
|
||||||
run: |
|
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
|
- name: Compress Releases
|
||||||
id: compress-release
|
id: compress-release
|
||||||
|
|||||||
20
.github/workflows/build-release-manual.yaml
vendored
20
.github/workflows/build-release-manual.yaml
vendored
@@ -125,7 +125,7 @@ jobs:
|
|||||||
- name: Setup Node
|
- name: Setup Node
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20.11.1
|
node-version: 22.12.0
|
||||||
|
|
||||||
- name: Runner Debug Information
|
- name: Runner Debug Information
|
||||||
id: debug-info
|
id: debug-info
|
||||||
@@ -200,7 +200,7 @@ jobs:
|
|||||||
|
|
||||||
# docker
|
# docker
|
||||||
- name: Extract metadata for Docker with release version
|
- 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
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
@@ -213,7 +213,7 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}},value=${{ needs.prepare.outputs.TARGET_TAG }}
|
type=semver,pattern={{major}}.{{minor}},value=${{ needs.prepare.outputs.TARGET_TAG }}
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
- name: Extract metadata for Docker with release version and fika built-in
|
- 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
|
id: meta-fika
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
@@ -226,7 +226,7 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}}-fika,value=${{ needs.prepare.outputs.TARGET_TAG }}
|
type=semver,pattern={{major}}.{{minor}}-fika,value=${{ needs.prepare.outputs.TARGET_TAG }}
|
||||||
type=raw,value=latest-fika
|
type=raw,value=latest-fika
|
||||||
- name: Extract metadata for Docker with bem version
|
- 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
|
id: meta-bem
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
@@ -238,7 +238,7 @@ jobs:
|
|||||||
type=semver,pattern={{version}},value=${{ needs.prepare.outputs.TARGET_TAG }}
|
type=semver,pattern={{version}},value=${{ needs.prepare.outputs.TARGET_TAG }}
|
||||||
type=semver,pattern={{major}}.{{minor}},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
|
- 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
|
id: meta-bem-fika
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
@@ -277,7 +277,7 @@ jobs:
|
|||||||
password: ${{ secrets.ALIYUN_REGISTRY_TOKEN }}
|
password: ${{ secrets.ALIYUN_REGISTRY_TOKEN }}
|
||||||
|
|
||||||
- name: Build and Push For Release With Fika
|
- 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
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: ./docker
|
context: ./docker
|
||||||
@@ -291,7 +291,7 @@ jobs:
|
|||||||
org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
|
org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
- name: Build and Push For Release
|
- 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
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: ./docker
|
context: ./docker
|
||||||
@@ -306,7 +306,7 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
|
|
||||||
- name: Build and Push For BEM With Fika
|
- 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
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: ./docker
|
context: ./docker
|
||||||
@@ -320,7 +320,7 @@ jobs:
|
|||||||
org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
|
org.opencontainers.image.revision=${{ needs.build-server-linux.outputs.LINUX_COMMIT_ID_WHOLE }}
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
- name: Build and Push For BEM
|
- 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
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: ./docker
|
context: ./docker
|
||||||
@@ -455,7 +455,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Download Fika-Server
|
- name: Download Fika-Server
|
||||||
run: |
|
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
|
- name: Compress Releases
|
||||||
id: compress-release
|
id: compress-release
|
||||||
|
|||||||
Reference in New Issue
Block a user