diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /scripts/setup | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'scripts/setup')
| -rwxr-xr-x | scripts/setup/as-if-jh.sh | 5 | ||||
| -rwxr-xr-x | scripts/setup/find-jh-branch.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/setup/as-if-jh.sh b/scripts/setup/as-if-jh.sh index 38c3ac9b913..445a988b996 100755 --- a/scripts/setup/as-if-jh.sh +++ b/scripts/setup/as-if-jh.sh @@ -19,10 +19,9 @@ download_jh_path() { echoinfo "Downloading ${path}" - curl --location -o "${output}" -H "Private-Token: ${ADD_JH_FILES_TOKEN}" "https://gitlab.com/api/v4/projects/${GITLAB_JH_MIRROR_PROJECT}/repository/archive?sha=${JH_BRANCH}&path=${path}" + curl --location --output "${output}" --header "Private-Token: ${ADD_JH_FILES_TOKEN}" --get --data-urlencode "sha=${JH_BRANCH}" --data-urlencode "path=${path}" "https://gitlab.com/api/v4/projects/${GITLAB_JH_MIRROR_PROJECT}/repository/archive" - tar -zxf "${output}" + tar -zxf "${output}" --strip-component 1 rm "${output}" - mv gitlab-"${JH_BRANCH}"-*/"${path}" ./ done } diff --git a/scripts/setup/find-jh-branch.rb b/scripts/setup/find-jh-branch.rb index 5b36aa7a1f4..67e83423d9c 100755 --- a/scripts/setup/find-jh-branch.rb +++ b/scripts/setup/find-jh-branch.rb @@ -92,7 +92,7 @@ class FindJhBranch def gitlab @gitlab ||= Gitlab.client( endpoint: API::DEFAULT_OPTIONS[:endpoint], - private_token: API::DEFAULT_OPTIONS[:api_token] || '' + private_token: ENV['ADD_JH_FILES_TOKEN'] || '' ) end end |