-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add versioning in packet name (#886)
- Loading branch information
Michael Bonani
authored
Nov 25, 2020
1 parent
b457f76
commit fbb4bd7
Showing
1 changed file
with
7 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
@@ -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') | ||
|
|
@@ -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 | ||
|
|
||