Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Timi007 committed Feb 25, 2022
2 parents f1f3691 + ee9068f commit 02510b3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,20 @@ jobs:
echo "::group::Set Binarize registry path"
New-Item "HKCU:\\Software\\Bohemia Interactive\\binarize" -Force | New-ItemProperty -Name path -Value "${{ github.workspace }}\ci\binarize"
echo "::endgroup::"
echo "::group::Set env variables"
echo "Set env variables"
echo "NAME=$(.\\ci\\hemtt.exe var name)" >> $env:GITHUB_ENV
echo "MOD_NAME=$(.\\ci\\hemtt.exe var modname)" >> $env:GITHUB_ENV
echo "MOD_NAME_LOWER=$((.\\ci\\hemtt.exe var modname).toLower())" >> $env:GITHUB_ENV
echo "MAIN_PREFIX=$(.\\ci\\hemtt.exe var mainprefix)" >> $env:GITHUB_ENV
echo "VERSION=$(.\\ci\\hemtt.exe var version)" >> $env:GITHUB_ENV
echo "VERSION_SHORT=$(($(.\\ci\\hemtt.exe var version) | Select-String -Pattern '^\d+\.\d+\.\d+').Matches.Value)" >> $env:GITHUB_ENV
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $env:GITHUB_ENV
echo "::endgroup::"
- name: Setup P-Drive for ArmaScriptCompiler
run: |
echo "Creating P: and linking ${{ env.MAIN_PREFIX }}\${{ env.MOD_NAME_LOWER }}\addons"
echo "Creating P: and linking ${{ env.MAIN_PREFIX }}\mts_enhanced\addons"
subst p: include
New-Item -ItemType Junction -Path "p:${{ env.MAIN_PREFIX }}\${{ env.MOD_NAME_LOWER }}\addons" -Target "addons"
New-Item -ItemType Junction -Path "p:${{ env.MAIN_PREFIX }}\mts_enhanced\addons" -Target "addons"
- name: Test Binarize
run: |
Expand Down
2 changes: 1 addition & 1 deletion hemtt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ releasebuild = [
]

[header_exts]
version= "{{git \"id 8\"}}"
version = "{{git \"id 8\"}}"

# SQF Compilation
[scripts.compile_sqf]
Expand Down

0 comments on commit 02510b3

Please sign in to comment.