diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 719a07250c..cdbb66a5b4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -106,16 +106,8 @@ jobs: $HOME/.conan/conan_download_cache key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache - - name: Hack needed specifically for ubuntu-22.04 from mid-Feb 2023 onwards - if: ${{ startsWith(inputs.operating_system, 'ubuntu-22.04') }} - run: sudo apt remove libodbc2 libodbcinst2 unixodbc-common -y - - # NOTE: Due to what are probably github issues, we have to remove the cache and reconfigure before the rest. - # This is maybe because grub caches the disk it uses last time, which is recreated each time. - name: Install Linux system requirements run: | - sudo rm /var/cache/debconf/config.dat - sudo dpkg --configure -a sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt update sudo apt upgrade @@ -157,6 +149,11 @@ jobs: - name: Create the Packages (Bash) run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) if: always() run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 78b4c23fef..028822d778 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -158,8 +158,12 @@ jobs: - name: Create the Packages (Bash) run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) - if: ${{ inputs.operating_system != 'self-hosted' }} run: | conan upload "*" -r cura --all -c diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9c9775cae7..40d9df92c3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -124,6 +124,11 @@ jobs: - name: Create the Packages (Powershell) run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) if: always() run: |