From 17cc36a96d7da42b9ccf5d21448b51663d3fe2bf Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 28 Nov 2023 16:19:35 +0100 Subject: [PATCH] Switch to cura jfrog Contributes to CURA-10831 --- .github/workflows/conan-package-create.yml | 16 ++++------------ .github/workflows/conan-package.yml | 5 ----- .github/workflows/conan-recipe-export.yml | 12 ++---------- .github/workflows/linux.yml | 3 --- .github/workflows/macos.yml | 5 +---- .github/workflows/windows.yml | 3 --- 6 files changed, 7 insertions(+), 37 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 220c8feef3..56c96f483f 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -139,26 +139,18 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - name: Add Cura private Artifactory remote - run: | - conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True - conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True + run: conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True - name: Set GH service account for remote cura-conan-dev - run: | - conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" + run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - name: Create the Packages run: conan install ${{ inputs.recipe_id_full }} --build=missing --update -c tools.build:skip_test=True - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: | - conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - conan upload ${{ inputs.recipe_id_full }} -r cura-conan-dev --all -c + run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} - run: | - conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c - conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c + run: conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index c561e85a94..4b5c0f914a 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -118,9 +118,6 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - name: Set GH service account for remote cura-conan-dev - run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - - name: Create the Packages run: conan create . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o ${{ needs.conan-recipe-version.outputs.project_name }}:devtools=True -o ${{ needs.conan-recipe-version.outputs.project_name }}:enable_i18n=True -c tools.build:skip_test=True @@ -132,9 +129,7 @@ jobs: if: always() run: | conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura --all -c - conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura-conan-dev --all -c conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura -c - conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-conan-dev -c notify-create: if: ${{ always() && (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 9036fe9a21..69c4e4d34a 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -80,14 +80,10 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - name: Add Cura private Artifactory remote - run: | - conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True - conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True + run: conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True - name: Set GH service account for remote cura-conan-dev - run: | - conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" + run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - name: Export the Package (binaries) if: ${{ inputs.conan_export_binaries }} @@ -105,14 +101,10 @@ jobs: if: ${{ always() && inputs.conan_upload_community }} run: | conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - conan upload ${{ inputs.recipe_id_full }} -r cura-conan-dev --all -c conan upload ${{ inputs.recipe_id_latest }} -r cura -c - conan upload ${{ inputs.recipe_id_latest }} -r cura-conan-dev -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} run: | - conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c - conan upload ${{ inputs.recipe_id_latest }} -r cura-private -c conan upload ${{ inputs.recipe_id_latest }} -r cura-private-conan-dev -c diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 52dc5e73d3..1dee7a237f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -143,9 +143,6 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - name: Set GH service account for remote cura-conan-dev - run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - - name: Use Conan download cache (Bash) run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9e6dbf8541..2c7186a764 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -145,16 +145,13 @@ jobs: p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} - name: Remove private Artifactory - run: conan remote remove cura-conan-private || true + run: conan remote remove cura-private-conan-dev || true - name: Get Conan configuration run: | conan config install https://github.com/Ultimaker/conan-config.git conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - name: Set GH service account for remote cura-conan-dev - run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - - name: Use Conan download cache (Bash) run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index eb0e47b2bf..ad946d9d99 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -118,9 +118,6 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - name: Set GH service account for remote cura-conan-dev - run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}" - - name: Use Conan download cache (Powershell) run: conan config set storage.download_cache="C:\Users\runneradmin\.conan\conan_download_cache"