3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Revert "Allow for a bool to only build from local cache"

Browse source 
This reverts commit e1fcca3d9c.
This commit is contained in:
Jelle Spijker 2022-06-16 06:23:05 +02:00
parent 5b143234b5
commit 09a52d93d6
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/conan-package-create.yml vendored
View file

@ -23,11 +23,6 @@ on:
required: false required: false
type: string type: string
# FIXME: Once we have the new JFrog server up and running
conan_no_update:
required: false
type: boolean
env: env:
CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }} CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }}
@ -56,11 +51,11 @@ jobs:
conan profile new default --detect conan profile new default --detect
- name: Get Conan configuration from branch - name: Get Conan configuration from branch
if: ${{ inputs.conan_config_branch == '' }} if: "${{ inputs.conan_config_branch == '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
- name: Get Conan configuration - name: Get Conan configuration
if: ${{ inputs.conan_config_branch != '' }} if: "${{ inputs.conan_config_branch != '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git run: conan config install https://github.com/Ultimaker/conan-config.git
- name: Cache Conan local repository packages (Bash) - name: Cache Conan local repository packages (Bash)
@ -80,14 +75,7 @@ jobs:
key: ${{ runner.os }}-conan key: ${{ runner.os }}-conan
- name: Create the Packages - name: Create the Packages
if: ${{ inputs.conan_no_update != 'true' }} # FIXME: Once we have the new JFrog server up and running
run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update
# FIXME: Once we have the new JFrog server up and running
- name: Create the Packages
if: ${{ inputs.conan_no_update == 'true' }}
run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing
- name: Upload the Package(s) - name: Upload the Package(s)
if: ${{ inputs.conan_no_update == 'true' }} # FIXME: Once we have the new JFrog server up and running
run: conan upload "*" -r ultimaker --all -c run: conan upload "*" -r ultimaker --all -c

12
.github/workflows/conan-recipe-export.yml vendored
View file

@ -27,11 +27,6 @@ on:
required: false required: false
type: string type: string
# FIXME: Once we have the new JFrog server up and running
conan_no_update:
required: false
type: boolean
env: env:
CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }} CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }}
@ -60,11 +55,11 @@ jobs:
conan profile new default --detect conan profile new default --detect
- name: Get Conan configuration from branch - name: Get Conan configuration from branch
if: ${{ inputs.conan_config_branch == '' }} if: "${{ inputs.conan_config_branch == '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
- name: Get Conan configuration - name: Get Conan configuration
if: ${{ inputs.conan_config_branch != '' }} if: "${{ inputs.conan_config_branch != '' }}"
run: conan config install https://github.com/Ultimaker/conan-config.git run: conan config install https://github.com/Ultimaker/conan-config.git
- name: Cache Conan local repository packages - name: Cache Conan local repository packages
@ -77,9 +72,8 @@ jobs:
run: conan export . ${{ inputs.recipe_id_full }} run: conan export . ${{ inputs.recipe_id_full }}
- name: Create the latest alias - name: Create the latest alias
if: ${{ inputs.recipe_id_latest == '' }} if: "${{ inputs.recipe_id_latest == '' }}"
run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }}
- name: Upload the Package(s) - name: Upload the Package(s)
if: ${{ inputs.conan_no_update == 'true' }} # FIXME: Once we have the new JFrog server up and running
run: conan upload "*" -r ultimaker --all -c run: conan upload "*" -r ultimaker --all -c