Skip to content

Commit 96794a2

Browse files
DanTheMan827michael-r-elp
authored andcommitted
Fix version.txt path
1 parent 64c07c7 commit 96794a2

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/Release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
16-
16+
1717
steps:
1818
- uses: actions/checkout@v4
1919
name: Checkout
@@ -25,7 +25,7 @@ jobs:
2525
run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
2626

2727
- uses: seanmiddleditch/gha-setup-ninja@v5
28-
28+
2929
- name: Get QPM
3030
uses: Fernthedev/qpm-action@v1
3131
with:
@@ -56,7 +56,7 @@ jobs:
5656
- name: Get BSVersion & Update mod.template.json
5757
shell: pwsh
5858
run: |
59-
$BSVersion = Get-Content ./extern/includes/bs-cordl/version.txt
59+
$BSVersion = Get-Content ./extern/includes/bs-cordl/include/version.txt
6060
echo "BSVersion=$($BSVersion)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6161
$modTemplate = Get-Content ./mod.template.json -Raw | ConvertFrom-Json
6262
$modTemplate.packageVersion = $BSVersion
@@ -69,7 +69,7 @@ jobs:
6969
# $externcmake = Get-Content $cmakeFilePath -Raw
7070
# $partToRemove = 'add_library(${COMPILE_ID} SHARED ${EXTERN_DIR}/includes/bs-cordl/version.txt)'
7171
# $externcmake -replace [regex]::Escape($partToRemove), '' | Set-Content $cmakeFilePath
72-
72+
7373
- name: Build
7474
run: |
7575
cd ${GITHUB_WORKSPACE}
@@ -98,4 +98,4 @@ jobs:
9898
./build/${{ env.module_id }}.so
9999
./build/debug_${{ env.module_id }}.so
100100
body_path: ./rl-notes.md
101-
draft: true
101+
draft: true

.github/workflows/buildMod.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121

2222
env:
2323
module_id: ClockMod
24-
24+
2525
jobs:
2626
build:
2727
runs-on: ubuntu-latest
28-
28+
2929
steps:
3030
- uses: actions/checkout@v4
3131
name: Checkout
@@ -37,7 +37,7 @@ jobs:
3737
shell: pwsh
3838
run: |
3939
$branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "version=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Split('-')[0])-$($branchMain).${{ github.run_number }}+$($branchSub)ra${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
40-
40+
4141
4242
- uses: seanmiddleditch/gha-setup-ninja@v5
4343

@@ -55,7 +55,7 @@ jobs:
5555
- name: QPM Collapse
5656
run: |
5757
qpm collapse
58-
58+
5959
- name: Check dependency Folders
6060
run: |
6161
echo "Checking extern includes"
@@ -71,7 +71,7 @@ jobs:
7171
- name: Get BSVersion & Update mod.template.json
7272
shell: pwsh
7373
run: |
74-
$BSVersion = Get-Content ./extern/includes/bs-cordl/version.txt
74+
$BSVersion = Get-Content ./extern/includes/bs-cordl/include/version.txt
7575
echo "BSVersion=$($BSVersion)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
7676
$modTemplate = Get-Content ./mod.template.json -Raw | ConvertFrom-Json
7777
$modTemplate.packageVersion = $BSVersion

buildQMOD.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ echo "Packaging QMod $qmodName"
5050

5151
# Update BS Version in mod.template.json using bs-cordl version.txt
5252
$modTemplate = Get-Content "./mod.template.json" -Raw | ConvertFrom-Json
53-
$bsversion = Get-Content "./extern/includes/bs-cordl/version.txt"
53+
$bsversion = Get-Content "./extern/includes/bs-cordl/include/version.txt"
5454
if (-not [string]::IsNullOrWhitespace($bsversion)) {
5555
Write-Output "Setting Package Version to $bsversion"
5656
$modTemplate.packageVersion = $bsversion
57-
$modTemplate | ConvertTo-Json -Depth 10 | Set-Content "./mod.template.json"
57+
$modTemplate | ConvertTo-Json -Depth 10 | Set-Content "./mod.template.json"
5858
} else {
5959
Write-Error "Missing bs-cordl version.txt"
6060
}
@@ -84,4 +84,4 @@ $qmod = $qmodName + ".qmod"
8484

8585
& qpm qmod zip -i ./build/ -i ./extern/libs/ $qmod
8686

87-
echo "Task Completed"
87+
echo "Task Completed"

0 commit comments

Comments
 (0)