File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -27,15 +27,15 @@ jobs:
2727 push_description : false
2828
2929 steps :
30- - uses : actions/checkout@v4
30+ - uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131
3232 - name : Activate Docker buildx
33- uses : docker/setup-buildx-action@v3
33+ uses : docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
3434 with :
3535 driver-opts : env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
3636
3737 - name : Set up Python
38- uses : actions/setup-python@v5
38+ uses : actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
3939 with :
4040 python-version : 3.9
4141 cache : ' pipenv'
Original file line number Diff line number Diff line change @@ -246,9 +246,8 @@ def _build_conan_package(
246246 base_cmd ,
247247 [
248248 "conan" ,
249- "user" ,
250- "-p" ,
251- "-r" ,
249+ "remote" ,
250+ "auth" ,
252251 self .build_info .docker_org ,
253252 ],
254253 dry_run ,
Original file line number Diff line number Diff line change @@ -513,15 +513,15 @@ def test_builderlist_cli_conan(self):
513513 f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f { bake_path } --progress auto'" ,
514514 )
515515 self ._i += 1
516- self ._assertEndsWith (cmds , "conan user -p -r aswftesting'" )
516+ self ._assertEndsWith (cmds , "conan remote auth aswftesting'" )
517517 self .assertEqual (
518518 cmds [self ._i ],
519519 f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f { bake_path } "
520520 + "--set=*.output=type=cacheonly --set=*.target.target=ci-conan-package-builder "
521521 + "--progress auto ci-package-openexr-2019'" ,
522522 )
523523 self ._i += 1
524- self ._assertEndsWith (cmds , "conan user -p -r aswftesting'" )
524+ self ._assertEndsWith (cmds , "conan remote auth aswftesting'" )
525525 self .assertEqual (
526526 cmds [self ._i ],
527527 f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f { bake_path } "
You can’t perform that action at this time.
0 commit comments