Skip to content

Commit 3392f14

Browse files
committed
Redirect Conan - Artifactory authentication variables
The secrets for authentication against the Artifactory repository are called ARTIFACTORY_USER and ARTIFACTORY_TOKEN, copy those to environment variables CONAN_LOGIN_USERNAME and CONAN_PASSWORD which are expected by Conan to authenticate package uploads. Also fix pylint warning for obsolete --conan-login option to aswfdocker CLI which was breaking Sonar scan. Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent 7939f58 commit 3392f14

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
env:
1111
DOCKER_CLI_EXPERIMENTAL: enabled
1212
DOCKER_BUILDKIT: '1'
13-
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
14-
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
13+
CONAN_LOGIN_USERNAME: ${{ secrets.ARTIFACTORY_USER }}
14+
CONAN_PASSWORD: ${{ secrets.ARTIFACTORY_TOKEN }}
1515

1616
strategy:
1717
matrix:

python/aswfdocker/cli/aswfdocker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def build(
190190
use_conan,
191191
keep_source,
192192
keep_build,
193-
conan_login,
193+
conan_login, # pylint: disable=unused-argument
194194
build_missing,
195195
):
196196
"""Builds a ci-package or ci-image Docker image."""

0 commit comments

Comments
 (0)