From 77aaa9ad3169d66aaff78f03575872f804a22ced Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Avalos Date: Wed, 13 Nov 2024 17:50:04 -0300 Subject: [PATCH] 1.0rc4 [skip ci] --- .cirrus.yml | 2 +- .github/workflows/freecad_bundle.yml | 2 +- .github/workflows/source_creation.yml | 4 ++-- conda/linux/create_bundle.sh | 4 ++-- conda/osx/create_bundle.sh | 2 +- conda/win/create_bundle.bat | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f765746..c610246 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,7 +13,7 @@ linux_task: env: DEBIAN_FRONTEND: noninteractive ASSET_PATTERN: FreeCAD_.*Linux-aarch64 - DEPLOY_RELEASE: 1.0rc3 + DEPLOY_RELEASE: 1.0rc4 TARGET_REPO: $CIRRUS_REPO_FULL_NAME # Instructions: diff --git a/.github/workflows/freecad_bundle.yml b/.github/workflows/freecad_bundle.yml index 33c3147..066e0b7 100644 --- a/.github/workflows/freecad_bundle.yml +++ b/.github/workflows/freecad_bundle.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macos-latest, macos-13, ubuntu-latest] - tag: ["1.0rc3"] + tag: ["1.0rc4"] include: - os: windows-latest bundle_dir: conda/win diff --git a/.github/workflows/source_creation.yml b/.github/workflows/source_creation.yml index 89d96c4..87c3deb 100644 --- a/.github/workflows/source_creation.yml +++ b/.github/workflows/source_creation.yml @@ -14,8 +14,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tag: ["1.0rc3"] - branch: ["1.0rc3"] + tag: ["1.0rc4"] + branch: ["1.0rc4"] steps: - name: create source package with submodules and version info diff --git a/conda/linux/create_bundle.sh b/conda/linux/create_bundle.sh index 161fa01..8ec0ea6 100755 --- a/conda/linux/create_bundle.sh +++ b/conda/linux/create_bundle.sh @@ -11,7 +11,7 @@ echo -e "\nCreate the environment" mamba create --copy -y -p ${conda_env} \ -c freecad/label/dev \ -c conda-forge \ - freecad=1.0rc3 \ + freecad=1.0rc4 \ python=3.11 \ noqt6 \ appimage-updater-bridge \ @@ -95,7 +95,7 @@ find . -name "*.cmake" -type f -delete if [ "$DEPLOY_RELEASE" = "weekly-builds" ]; then export tag="weekly-builds" else - export tag="1.0rc3" # TODO: revert for actual release to "latest" + export tag="1.0rc4" # TODO: revert for actual release to "latest" fi echo -e "\nCreate the appimage" diff --git a/conda/osx/create_bundle.sh b/conda/osx/create_bundle.sh index c078c15..8a5eaa1 100644 --- a/conda/osx/create_bundle.sh +++ b/conda/osx/create_bundle.sh @@ -5,7 +5,7 @@ conda_env="APP/FreeCAD.app/Contents/Resources" mamba create -y --copy -c freecad/label/dev -c conda-forge -p ${conda_env} \ python=3.11 \ - freecad=1.0rc3 \ + freecad=1.0rc4 \ noqt6 \ blas=*=openblas \ blinker \ diff --git a/conda/win/create_bundle.bat b/conda/win/create_bundle.bat index 49ba908..a405613 100644 --- a/conda/win/create_bundle.bat +++ b/conda/win/create_bundle.bat @@ -5,7 +5,7 @@ mkdir %copy_dir% call mamba create ^ -p %conda_env% ^ - freecad=1.0rc3 ^ + freecad=1.0rc4 ^ python=3.11 ^ noqt6 ^ blinker ^