phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix msi (#1548)

Browse Source 
* fix checking for a tag

* fix ico path

* no need to remove asar.unpack

* fix copy from various sources to same dir
This commit is contained in:
Guillermo Vayá
2021-04-20 12:20:37 +02:00
committed by GitHub
parent 992324f42f
commit b8e2822457
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@@ -287,14 +287,14 @@ jobs:
- run: - run:
name: "Don't upload if it's not on a tag" name: "Don't upload if it's not on a tag"
command: | command: |
if [ -z `git tag -l --points-at master` ]; then if [ -z `git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null` ]; then
circleci-agent step halt circleci-agent step halt
fi fi
- run: - run:
name: "Setup files for aws-s3" name: "Setup files for aws-s3"
command: | command: |
mkdir -p ./aws-s3-dist mkdir -p ./aws-s3-dist
cp ./dist/{macos-release,win-release,linux}/* ./aws-s3-dist cp --backup=numbered ./dist/{macos-release,win-release,linux}/* ./aws-s3-dist
- aws-s3/copy: - aws-s3/copy:
from: ./aws-s3-dist/ from: ./aws-s3-dist/
to: s3://releases.mattermost.com/desktop/$(jq -r .version package.json)/ to: s3://releases.mattermost.com/desktop/$(jq -r .version package.json)/
@@ -324,14 +324,14 @@ jobs:
- run: - run:
name: "Don't upload if it's not on a tag" name: "Don't upload if it's not on a tag"
command: | command: |
if [ -z `git tag -l --points-at master` ]; then if [ -z `git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null` ]; then
circleci-agent step halt circleci-agent step halt
fi fi
- run: - run:
name: "Setup files for ghr" name: "Setup files for ghr"
command: | command: |
mkdir -p ./ghr-dist mkdir -p ./ghr-dist
cp ./dist/{macos-release,win-release,linux}/* ./ghr-dist cp --backup=numbered ./dist/{macos-release,win-release,linux}/* ./ghr-dist
- run: - run:
name: "Publish Release on GitHub" name: "Publish Release on GitHub"
command: | command: |

4
scripts/Makefile.ps1
View File

@@ -533,10 +533,6 @@ function Run-BuildElectron {
Print-Info "Packaging nodejs/electron for Windows (running npm run package:windows)..." Print-Info "Packaging nodejs/electron for Windows (running npm run package:windows)..."
npm run package:windows npm run package:windows
#npm run package:windows --prefix="$(Get-RootDir)" "$(Get-RootDir)" #npm run package:windows --prefix="$(Get-RootDir)" "$(Get-RootDir)"
Print-Info "Cleaning build dir..."
Remove-Item "release\win-ia32-unpacked\resources\app.asar.unpacked\" -Force -Recurse
Remove-Item "release\win-unpacked\resources\app.asar.unpacked\" -Force -Recurse
} }
function Run-BuildForceSignature { function Run-BuildForceSignature {

2
scripts/msi_installer.wxs
View File

@@ -131,7 +131,7 @@
</InstallExecuteSequence> </InstallExecuteSequence>
<CustomAction Id="LaunchApp" FileKey="MattermostDesktopEXE" ExeCommand="" Return="asyncNoWait" /> <CustomAction Id="LaunchApp" FileKey="MattermostDesktopEXE" ExeCommand="" Return="asyncNoWait" />
<CustomAction Id="KillApp" Directory="INSTALLDIR" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;Mattermost.exe&quot;" /> <CustomAction Id="KillApp" Directory="INSTALLDIR" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;Mattermost.exe&quot;" />
<Icon Id="Mattermost.ico" SourceFile="../resources/icon.ico" /> <Icon Id="Mattermost.ico" SourceFile="../src/assets/icon.ico" />
<Property Id="ARPPRODUCTICON">Mattermost.ico</Property> <Property Id="ARPPRODUCTICON">Mattermost.ico</Property>
<Property Id="ARPCONTACT">https://pre-release.mattermost.com</Property> <Property Id="ARPCONTACT">https://pre-release.mattermost.com</Property>
<Property Id="ARPHELPLINK">https://docs.mattermost.com/</Property> <Property Id="ARPHELPLINK">https://docs.mattermost.com/</Property>