Commit 281817eb authored by Daniel Agar's avatar Daniel Agar

appveyor cleanup s3 deploy

-qmake rename installer output
parent 981fbd48
version: '{branch}-{build}'
build:
verbosity: minimal
environment: environment:
matrix: matrix:
...@@ -20,12 +24,12 @@ build_script: ...@@ -20,12 +24,12 @@ build_script:
test_script: test_script:
- if "%CONFIG%" EQU "debug" ( debug\qgroundcontrol --unittest ) - if "%CONFIG%" EQU "debug" ( debug\qgroundcontrol --unittest )
after_build: artifacts:
- if "%CONFIG%" EQU "installer" ( if defined %APPVEYOR_PULL_REQUEST_NUMBER% ( appveyor PushArtifact C:\projects\qgroundcontrol\release\qgroundcontrol.exe ) ) - path: 'release\qgroundcontrol-installer.exe'
name: s3
deploy: deploy:
- provider: S3 - provider: S3
name: qgroundcontrol-s3
access_key_id: access_key_id:
secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c= secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
secret_access_key: secret_access_key:
...@@ -33,11 +37,11 @@ deploy: ...@@ -33,11 +37,11 @@ deploy:
bucket: qgroundcontrol bucket: qgroundcontrol
set_public: true set_public: true
folder: $(APPVEYOR_REPO_BRANCH) folder: $(APPVEYOR_REPO_BRANCH)
artifcat: 'release\qgroundcontrol.exe' artifact: 'release\qgroundcontrol-installer.exe'
on: on:
CONFIG: installer CONFIG: installer
- provider: GitHub - provider: GitHub
artifact: 'release\qgroundcontrol.exe' artifact: 'release\qgroundcontrol-installer.exe'
draft: false draft: false
prerelease: false prerelease: false
on: on:
......
...@@ -46,7 +46,7 @@ installer { ...@@ -46,7 +46,7 @@ installer {
# easier to debug user crashes. # easier to debug user crashes.
#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
#QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb #QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi") QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
#QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN} #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
#QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
OTHER_FILES += deploy/qgroundcontrol_installer.nsi OTHER_FILES += deploy/qgroundcontrol_installer.nsi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment