Skip to content

Update Conan 2 authentication #234

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 21, 2025
Merged

Update Conan 2 authentication #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 2 additions & 3 deletions python/aswfdocker/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,8 @@ def _build_conan_package(
base_cmd,
[
"conan",
"user",
"-p",
"-r",
"remote",
"auth",
self.build_info.docker_org,
],
dry_run,
Expand Down
4 changes: 2 additions & 2 deletions python/aswfdocker/tests/test_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,15 +513,15 @@ 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} "
+ "--set=*.output=type=cacheonly --set=*.target.target=ci-conan-package-builder "
+ "--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} "
Expand Down
Loading