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

Add fixes for release process #6704

Merged
merged 2 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .gitlab/prepare-oci-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ elif [ "$OS" == "windows" ]; then
exit 0
fi

if [ -n "$CI_COMMIT_TAG" ]; then
echo "Creating public release, skipping Windows artifacts"
exit 0
fi

# unzip the tracer home directory, and remove the xml files
mkdir -p sources/library
unzip ../artifacts/windows/windows-tracer-home.zip -d sources/library
Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/Build.GitHub.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,8 @@ static async Task DownloadAzureArtifact(AbsolutePath outputDirectory, BuildArtif
// buildHttpClient.GetArtifactContentZipAsync doesn't seem to work due to 'Redirect' response status.
// instead of downloading resources from https://dev.azure.com/ resource url starts with https://artprodcus3.artifacts.visualstudio.com
var temporary = new HttpClient();
// some of these files are _huge_ so give a long time to download them
temporary.Timeout = TimeSpan.FromMinutes(10);
temporary.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($":{token}")));

var resourceDownloadUrl = artifact.Resource.DownloadUrl;
Expand Down Expand Up @@ -1466,6 +1468,7 @@ async Task DownloadGitlabArtifacts(AbsolutePath outputDirectory, string commitSh
// We don't actually need the file now, we just need to make sure it's available, so that we can
// use it in GitLab later to build the OCI image.
var tempDir = TempDirectory / Path.GetRandomFileName();
Directory.CreateDirectory(tempDir);
await DownloadArtifact(client, tempDir, $"{awsUri}fleet-installer.zip");

return;
Expand Down
Loading