File tree Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Original file line number Diff line number Diff line change 1
1
include :
2
2
project : TankerHQ/gitlab-ci-files
3
- ref : 2021-12-16-236
3
+ ref : 2022-08-19-248
4
4
file : /common.yml
5
5
6
6
# ###########
@@ -55,15 +55,9 @@ stages:
55
55
- poetry run python -m pip install --upgrade pip
56
56
- poetry install
57
57
- poetry run python run-ci.py download-artifacts --project-id=$UPSTREAM_PROJECT_ID --pipeline-id=$UPSTREAM_PIPELINE_ID --job-name=$UPSTREAM_JOB_NAME
58
- - poetry run python run-ci.py reset-branch $(cat branch_name.txt)
59
- - poetry run python -m pip install --upgrade pip
60
- - poetry install
61
58
62
59
.before-script/rbenv-path :
63
60
before_script :
64
- - poetry run python -m pip install --upgrade pip
65
- - poetry install
66
- - poetry run python run-ci.py reset-branch $UPSTREAM_BRANCH_NAME
67
61
- poetry run python -m pip install --upgrade pip
68
62
- poetry install
69
63
- export PATH=$HOME/.rbenv/versions/$RBENV_VERSION/bin:$PATH
@@ -73,9 +67,6 @@ stages:
73
67
- poetry run python -m pip install --upgrade pip
74
68
- poetry install
75
69
- poetry run python run-ci.py download-artifacts --project-id=$UPSTREAM_PROJECT_ID --pipeline-id=$UPSTREAM_PIPELINE_ID --job-name=$UPSTREAM_JOB_NAME
76
- - poetry run python run-ci.py reset-branch $(cat branch_name.txt)
77
- - poetry run python -m pip install --upgrade pip
78
- - poetry install
79
70
- export PATH=$HOME/.rbenv/versions/$RBENV_VERSION/bin:$PATH
80
71
81
72
# ################
@@ -322,7 +313,6 @@ deploy:
322
313
- .rules/deploy/ruby
323
314
- .before-script/rbenv-path
324
315
script :
325
- - poetry run python run-ci.py reset-branch $UPSTREAM_BRANCH_NAME
326
316
- poetry run python run-ci.py deploy --version $SDK_RUBY_RELEASE_VERSION
327
317
needs :
328
318
- prepare/linux
Original file line number Diff line number Diff line change @@ -111,9 +111,6 @@ def main() -> None:
111
111
dest = "update" ,
112
112
)
113
113
114
- reset_branch_parser = subparsers .add_parser ("reset-branch" )
115
- reset_branch_parser .add_argument ("branch" , nargs = "?" )
116
-
117
114
download_artifacts_parser = subparsers .add_parser ("download-artifacts" )
118
115
download_artifacts_parser .add_argument ("--project-id" , required = True )
119
116
download_artifacts_parser .add_argument ("--pipeline-id" , required = True )
@@ -158,12 +155,6 @@ def main() -> None:
158
155
deploy (args .version )
159
156
elif command == "lint" :
160
157
lint ()
161
- elif command == "reset-branch" :
162
- fallback = os .environ ["CI_COMMIT_REF_NAME" ]
163
- ref = tankerci .git .find_ref (
164
- Path .cwd (), [f"origin/{ args .branch } " , f"origin/{ fallback } " ]
165
- )
166
- tankerci .git .reset (Path .cwd (), ref , clean = False )
167
158
elif command == "download-artifacts" :
168
159
tankerci .gitlab .download_artifacts (
169
160
project_id = args .project_id ,
You can’t perform that action at this time.
0 commit comments