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

Minor CI fixes #6000

Merged
merged 2 commits into from
Sep 6, 2024
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
6 changes: 6 additions & 0 deletions .github/workflows/auto_code_freeze_block_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ name: Auto Block PR on Code Freeze

on:
pull_request:
branches:
- 'main'
- 'master'
- 'release/**'
- 'hotfix/**'


jobs:
check_for_code_freeze:
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ publish:
download-single-step-artifacts:
stage: package
image: registry.ddbuild.io/docker:20.10.13-gbi-focal
timeout: 45m
tags: [ "arch:amd64" ]
needs: []
rules:
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/download-single-step-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ echo "Found build with id '$buildId' for commit '$CI_COMMIT_SHA' on branch '$bra
# Now try to download the ssi artifacts from the build
artifactsUrl="https://dev.azure.com/datadoghq/dd-trace-dotnet/_apis/build/builds/$buildId/artifacts?api-version=7.1&artifactName=$artifactName"

# Keep trying to get the artifact for 30 minutes
TIMEOUT=1800
# Keep trying to get the artifact for 40 minutes
TIMEOUT=2400
STARTED=0
until (( STARTED == TIMEOUT )) || [ ! -z "${downloadUrl}" ] ; do
echo "Checking for artifacts at '$artifactsUrl'..."
Expand Down
Loading