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.

Sign up for GitHub

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

Another try to add AppX to artifact links #733

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Another try to add AppX to artifact links #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ steps:
buildkite-agent artifact download "*.app.zip" .
buildkite-agent artifact download "*.dmg" .
buildkite-agent artifact download "*.exe" .
buildkite-agent artifact download "*.appx" .
buildkite-agent artifact download "*.nupkg" .
buildkite-agent artifact download "*\\RELEASES" .

Expand Down Expand Up @@ -248,6 +249,7 @@ steps:
buildkite-agent artifact download "*.zip" .
buildkite-agent artifact download "*.dmg" .
buildkite-agent artifact download "*.exe" .
buildkite-agent artifact download "*.appx" .
Copy link
Contributor Author

@wojtekn wojtekn Dec 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build step neees to download the appx files before distributing them.

buildkite-agent artifact download "*.nupkg" .
buildkite-agent artifact download "*\\RELEASES" .

Expand Down
16 changes: 15 additions & 1 deletion fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def distribute_builds(
# If we are distributing a build without a tag, i.e. a development build, we also want to update the latest build reference for distribution.
update_latest = release_tag.nil?
suffix = release_tag.nil? ? commit_hash : release_tag
normalized_version = suffix.gsub(/^v|-.*/, '')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added v as without that build script tried to access Studio v1.3.0.0.appx and not Studio 1.3.0.0.appx.

filename_root = 'studio'
bucket_folder = 'studio'

Expand Down Expand Up @@ -145,7 +146,20 @@ def distribute_builds(
suffix: 'full',
extension: 'nupkg',
name: 'Windows Update'
}
},
windows_appx: {
binary_path: File.join(BUILDS_FOLDER, 'Studio-appx-signed', "Studio #{normalized_version}.0.appx"),
filename_core: 'win32',
extension: 'appx',
name: 'Windows (Appx)'
},
Comment on lines +150 to +155
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need the signed version of the appx.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we don't need ZIP, universal, etc. Let's leave it as is for completeness.

windows_appx_unsigned: {
binary_path: File.join(BUILDS_FOLDER, 'Studio-appx-unsigned', "Studio #{normalized_version}.0 unsigned.appx"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This approach doesn't work for dev builds as the build script looks for the Studio 287a659.0.appx file name, but the actual filename received from the previous step is Studio 1.3.0.0.appx.

Can we remove the version from the files to match behavior for other artifacts?

filename_core: 'win32',
suffix: 'unsigned',
extension: 'appx',
name: 'Windows (Unsigned Appx)'
},
}

# Add computed fields
Expand Down
Loading