Skip to content

Commit 5b46a56

Browse files
committed
I almost didn't mess anything up in previous commit!
1 parent ae492b9 commit 5b46a56

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
vs-prerelease: true
3737

3838
- name: Generate project files (premake)
39-
run: premake/premake5 vs2022 --ci-build ${{ env.BME_CHANNEL }}
39+
run: premake/premake5 vs2022 --ci-build=${{ env.BME_CHANNEL }}
4040

4141
- name: Build ZIP and embed it in BSP
4242
run: |
@@ -71,9 +71,9 @@ jobs:
7171
- name: Create Sentry release
7272
if: github.ref == 'refs/heads/master'
7373
run: |
74-
sentry-cli releases set-commits "${{ env.BME_VERSION }}" --auto --ignore-missing
75-
sentry-cli releases new "${{ env.BME_VERSION }}"
76-
sentry-cli releases deploys "${{ env.BME_VERSION }}" new -e ${{ env.BME_CHANNEL }}
74+
sentry-cli releases set-commits "bme-v${{ env.BME_VERSION }}" --auto --ignore-missing
75+
sentry-cli releases new "bme-v${{ env.BME_VERSION }}"
76+
sentry-cli releases deploys "bme-v${{ env.BME_VERSION }}" new -e ${{ env.BME_CHANNEL }}
7777
7878
- name: "Upload pdb and executables to Sentry"
7979
if: github.ref == 'refs/heads/master'

generate.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
:: This generates Visual Studio projects for building the C++ parts.
44

55
git submodule update --init
6-
premake\premake5 %* vs2022
6+
premake\premake5 vs2022 %*

premake/bmedll.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ linkoptions {
2727
"/CETCOMPAT", -- CET Shadow Stack Compatible
2828
}
2929

30-
prebuildcommands {"pushd %{_MAIN_SCRIPT_DIR}", "premake\\premake5 generate-buildinfo", "popd"}
30+
prebuildcommands {"pushd %{_MAIN_SCRIPT_DIR}", "premake\\premake5 generate-buildinfo" .. (_OPTIONS["ci-build"] and (" --ci-build=" .. _OPTIONS["ci-build"]) or ""), "popd"}
3131

3232
dependencies.imports()

premake/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ newaction {
4343
bmeVersion = bmeVersion .. "-DEV"
4444
end
4545

46-
local proc = assert(io.popen("git describe --dirty --broken --always", "r"))
46+
local proc = assert(io.popen("git describe --always" .. (_OPTIONS["ci-build"] and "" or " --dirty --broken"), "r"))
4747
local gitDescribeOutput = assert(proc:read('*all')):gsub("%s+", "")
4848
proc:close()
4949

0 commit comments

Comments
 (0)