Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to put version in dmg name #886

Merged
merged 3 commits into from
Nov 25, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ variables:
value: "v20200506.1"
- name: scratch_version
value: "v20201116.1"
- name: packet_version
value: "2.2.0"
- name: blockly_url
value: "https://github.com/Mobsya/thymio-blockly-standalone/releases/download/$(blockly_version)/thymio-blockly.tar.gz"
- name: scratch_url
Expand All @@ -39,7 +41,7 @@ jobs:
git submodule update --init --recursive
flatpak remote-add --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak-builder --user --install-deps-from=flathub --force-clean --keep-build-dirs -v --repo=bundle build-dir flatpak/org.mobsya.ThymioSuite.json
flatpak build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo bundle $(Build.ArtifactStagingDirectory)/thymio-suite.flatpak org.mobsya.ThymioSuite
flatpak build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo bundle $(Build.ArtifactStagingDirectory)/ThymioSuite-$(packet_version).flatpak org.mobsya.ThymioSuite
displayName: 'Build flatpak bundle'

- task: PublishBuildArtifacts@1
Expand Down Expand Up @@ -239,12 +241,12 @@ jobs:
displayName: 'Build with cmake'

- script: |
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuiteOsX-13-14.dmg build/bin '$(APPLE_CERTIFICATE_SIGNING_IDENTITY)'
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuite(packet_version)-OsX-13-14.dmg build/bin '$(APPLE_CERTIFICATE_SIGNING_IDENTITY)'
displayName: 'Signing and create dmg'
condition: ne(variables['Build.Reason'], 'PullRequest')

- script: |
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuiteOsX-13-14.dmg build/bin
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuite-$(packet_version)-OsX-13-14.dmg build/bin
displayName: 'Create Unsigned DMG'
condition: eq(variables['Build.Reason'], 'PullRequest')

Expand Down Expand Up @@ -301,11 +303,11 @@ jobs:
(mkdir build && cd build && cmake .. -GNinja -DBoost_DEBUG=OFF -DOPENSSL_LIBRARIES=/usr/local/Cellar/[email protected]/1.0.2t/lib -DOPENSSL_INCLUDE_DIR=/usr/local/Cellar/[email protected]/1.0.2t/include -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.13.2/clang_64/" && ninja)
displayName: 'Build with cmake'
- script: |
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuiteOsX-15+.dmg build/bin '$(APPLE_CERTIFICATE_SIGNING_IDENTITY)'
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuite-$(packet_version)-OsX-15+.dmg build/bin '$(APPLE_CERTIFICATE_SIGNING_IDENTITY)'
displayName: 'Signing and create dmg'
condition: ne(variables['Build.Reason'], 'PullRequest')
- script: |
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuiteOsX-15+.dmg build/bin
osx/createbundle.sh $(Build.ArtifactStagingDirectory)/ThymioSuite-$(packet_version)-OsX-15+.dmg build/bin
displayName: 'Create Unsigned DMG'
condition: eq(variables['Build.Reason'], 'PullRequest')
- task: PublishBuildArtifacts@1
Expand Down