diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a796a084..e66f3b57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,15 +27,15 @@ jobs: push_description: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Activate Docker buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0 with: driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 with: python-version: 3.9 cache: 'pipenv' diff --git a/python/aswfdocker/builder.py b/python/aswfdocker/builder.py index c04e2ea0..d48a36b5 100644 --- a/python/aswfdocker/builder.py +++ b/python/aswfdocker/builder.py @@ -246,9 +246,8 @@ def _build_conan_package( base_cmd, [ "conan", - "user", - "-p", - "-r", + "remote", + "auth", self.build_info.docker_org, ], dry_run, diff --git a/python/aswfdocker/tests/test_builder.py b/python/aswfdocker/tests/test_builder.py index 3766ae5c..b86b9748 100644 --- a/python/aswfdocker/tests/test_builder.py +++ b/python/aswfdocker/tests/test_builder.py @@ -513,7 +513,7 @@ def test_builderlist_cli_conan(self): f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f {bake_path} --progress auto'", ) self._i += 1 - self._assertEndsWith(cmds, "conan user -p -r aswftesting'") + self._assertEndsWith(cmds, "conan remote auth aswftesting'") self.assertEqual( cmds[self._i], f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f {bake_path} " @@ -521,7 +521,7 @@ def test_builderlist_cli_conan(self): + "--progress auto ci-package-openexr-2019'", ) self._i += 1 - self._assertEndsWith(cmds, "conan user -p -r aswftesting'") + self._assertEndsWith(cmds, "conan remote auth aswftesting'") self.assertEqual( cmds[self._i], f"INFO:aswfdocker.builder:Would run: 'docker buildx bake -f {bake_path} "